remove -L/usr/lib in pcre-config, standardize Makefile

SVN-Revision: 1864

openwrt/package/pcre/Makefile

@@ -22,31 +22,31 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
+			--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
+			--build=$(GNU_HOST_NAME) \
-		--program-prefix="" \
+			--program-prefix="" \
-		--program-suffix="" \
+			--program-suffix="" \
-		--prefix=/usr \
+			--prefix=/usr \
-		--exec-prefix=/usr \
+			--exec-prefix=/usr \
-		--bindir=/usr/bin \
+			--bindir=/usr/bin \
-		--datadir=/usr/share \
+			--datadir=/usr/share \
-		--includedir=/usr/include \
+			--includedir=/usr/include \
-		--infodir=/usr/share/info \
+			--infodir=/usr/share/info \
-		--libdir=/usr/lib \
+			--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
+			--libexecdir=/usr/lib \
-		--localstatedir=/var \
+			--localstatedir=/var \
-		--mandir=/usr/share/man \
+			--mandir=/usr/share/man \
-		--sbindir=/usr/sbin \
+			--sbindir=/usr/sbin \
-		--sysconfdir=/etc \
+			--sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
+			$(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
+			$(DISABLE_NLS) \
-		--enable-shared \
+			--enable-shared \
-		--enable-static \
+			--enable-static \
-		--enable-utf8 \
+			--enable-utf8 \
 	);
 	touch $@
 
@@ -78,7 +78,7 @@ $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $(STAGING_DIR)/usr/lib/libpcre.so
+	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libpcre.so
 

openwrt/package/pcre/patches/750-pcre_config_cross.patch

@@ -0,0 +1,27 @@
+diff -ruN pcre-5.0-old/pcre-config.in pcre-5.0-new/pcre-config.in
+--- pcre-5.0-old/pcre-config.in	2004-09-13 16:20:00.000000000 +0200
++++ pcre-5.0-new/pcre-config.in	2005-09-04 16:34:39.000000000 +0200
+@@ -18,6 +18,10 @@
+   libR=" -R@libdir@"
+   ;;
+ esac
++libS=
++if test @libdir@ != /usr/lib ; then
++  libS=-L@libdir@
++fi
+ 
+ while test $# -gt 0; do
+   case "$1" in
+@@ -52,10 +56,10 @@
+       echo $includes
+       ;;
+     --libs-posix)
+-      echo -L@libdir@$libR -lpcreposix -lpcre
++      echo $libS$libR -lpcreposix -lpcre
+       ;;
+     --libs)
+-      echo -L@libdir@$libR -lpcre
++      echo $libS$libR -lpcre
+       ;;
+     *)
+       echo "${usage}" 1>&2