X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fpcre%2FMakefile;h=b2f83ebee39bee35e67da3ad0855d4b0ba161c40;hp=8bf548018226919c430d5b2f57766e2489211f22;hb=cdf7694d508ce5b447e48e48ca91a1dbcd8aadb3;hpb=2d68c6e1089c7cf2e6a64ac15da3ca93ce53d4e4

diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index 8bf5480182..b2f83ebee3 100644
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -1,20 +1,22 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcre
-PKG_VERSION:=7.9
+PKG_VERSION:=8.02
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pcre
-PKG_MD5SUM:=b6a9669d1863423f01ea46cdf00f93dc
+PKG_MD5SUM:=27948c1b5f5c1eabc23cba1ebe4c316f
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,27 +30,29 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
 	--enable-utf8 \
-	--disable-cpp \
+	--disable-cpp
 
 MAKE_FLAGS += \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	all \
+	CFLAGS="$(TARGET_CFLAGS)"
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/pcre-config $(1)/usr/bin/
-	ln -sf $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
-	$(CP) $(PKG_BUILD_DIR)/pcre{,posix}.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/
+
+	$(INSTALL_DIR) $(2)/bin
+	$(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
+
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libpcre/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libpcre))