From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 18 May 2007 09:43:14 +0000 (+0000)
Subject: Fix libtool pkg-config paths #1716
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ea1f61a32f4aee9f2d49b3c388600e3906a7f3d7;p=openwrt%2Fsvn-archive%2Fpackages.git

Fix libtool pkg-config paths #1716

SVN-Revision: 7271
---

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 1d29d6aa2..27bd72a08 100644
--- 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 024ad50b9..a7f595df5 100644
--- 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 045f4cbcc..c8a958420 100644
--- 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 efc7b8404..ed452c271 100644
--- 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 74640b20f..fba07251e 100644
--- 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