Fix libtool pkg-config paths #1716

SVN-Revision: 7271

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 1d29d6aa2c2dc780d0c795b704ecbcc524b0da76..27bd72a0805bf6e626be1b751688a12a5c8e1499 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -68,6 +68,7 @@ define Build/InstallDev
                $(STAGING_DIR)/usr/share/
        $(SED) "s,/usr/share/build,$(STAGING_DIR)/usr/share/build," $(STAGING_DIR)/usr/share/build/apr_rules.mk
        $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apr-config
+       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libapr-0.la
 endef
 
 define Build/UninstallDev

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 024ad50b9653c1cef950e6529ac231bb88629360..a7f595df59021c29e031c0b3245ec30447dd4525 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -109,6 +109,8 @@ define Build/InstallDev
        $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc
        mkdir -p $(STAGING_DIR)/usr/share/aclocal
        $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/
+       $(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/gnutls-extra.pc
+       $(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/gnutls-extra.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index 045f4cbcc6175705f1c0a73cab11a6de1ae6894c..c8a95842025df98415296c24ca2d07e1869ad592 100644 (file)
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -89,6 +89,8 @@ define Build/InstallDev
        $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xml2-config
        $(SED) 's,-I$$$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
        $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+       $(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+       $(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/neon/Makefile b/libs/neon/Makefile
index efc7b840472fd9667f38557411089c4f9b0288b1..ed452c271218e7ee8a5c2e82c19b5ad06a11d21d 100644 (file)
--- a/libs/neon/Makefile
+++ b/libs/neon/Makefile
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# crazy_imp
+# $Id: $
 
 include $(TOPDIR)/rules.mk
 
@@ -61,6 +61,9 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED)  "s,\=\/usr,\=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/neon-config
        $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libneon.la
+       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libneon.lav
+       $(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/neon.pc
+       $(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/neon.pc
 endef
 
 define Build/UninstallDev

diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile
index 74640b20f3705f54b5da604611d320b802097d30..fba07251efbe1a648f778c4de90db57604c389fa 100644 (file)
--- a/utils/apr-util/Makefile
+++ b/utils/apr-util/Makefile
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# crazy_imp
+# $ Id: $ 
 
 include $(TOPDIR)/rules.mk
 
@@ -56,6 +56,7 @@ define Build/InstallDev
                $(CP)   $(PKG_INSTALL_DIR)/usr/lib/*aprutil* \
                $(STAGING_DIR)/usr/lib/
        $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-config
+       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-0.la
 endef
 
 define Build/UninstallDev