added our own pkg-config wrapper, making the sed foo on *.pc files obselete 2/2

SVN-Revision: 9163

diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile
index 771a52d146f74e352e8e39e62dfbace9be240cb4..414e73d6c3322a35713fa461417c851d464a7a60 100644 (file)
--- a/XOrg/app/fontconfig/Makefile
+++ b/XOrg/app/fontconfig/Makefile
@@ -52,8 +52,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       $(SED)  "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/fontconfig.pc
-       $(SED)  "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/fontconfig.pc
        $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libfontconfig.la
 endef
 

diff --git a/XOrg/lib/atk/Makefile b/XOrg/lib/atk/Makefile
index b0fb539c88a80dee4d83d0056d26d1b0405f2640..902a6ecee2e98ec55cc1a1fd8d796b7161d75747 100644 (file)
--- a/XOrg/lib/atk/Makefile
+++ b/XOrg/lib/atk/Makefile
@@ -49,10 +49,7 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       $(SED)  "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/atk.pc
-       $(SED)  "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/atk.pc
        $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libatk-1.0.la
-       $(SED)  "s,Libs:,Libs: -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/ ,g" $(STAGING_DIR)/usr/lib/pkgconfig/atk.pc
 endef
 
 define Package/atk/Install

diff --git a/XOrg/lib/cairo/Makefile b/XOrg/lib/cairo/Makefile
index 8593ec55ac82a10d4c1a75f2e7a88ce67c71e528..31f5e327db2803107611a866695ccabbde370dae 100644 (file)
--- a/XOrg/lib/cairo/Makefile
+++ b/XOrg/lib/cairo/Makefile
@@ -46,8 +46,6 @@ endef
 
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/
-       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{cairo-ft,cairo,cairo-pdf,cairo-png,cairo-ps,cairo-svg,cairo-xlib,cairo-xlib-xrender}.pc
-       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{cairo-ft,cairo,cairo-pdf,cairo-png,cairo-ps,cairo-svg,cairo-xlib,cairo-xlib-xrender}.pc
        $(SED) "s,-L/usr/local/lib,,g" $(STAGING_DIR)/usr/lib/libcairo.la
        $(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(STAGING_DIR)/usr/lib/libcairo.la
        $(SED)  "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(STAGING_DIR)/usr/lib/libcairo.la

diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk-1.2.10/Makefile
index 56796dc74015abc4b8a64047544cd4a1a8f8a2a0..ccd8a4d330e58d41e05d7240aa219cb0f0c36198 100644 (file)
--- a/XOrg/lib/gtk-1.2.10/Makefile
+++ b/XOrg/lib/gtk-1.2.10/Makefile
@@ -56,8 +56,6 @@ endef
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/
        $(SED) "s,libdirs=-L.*,libdirs=,g" $(STAGING_DIR)/usr/bin/gtk-config
-       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*.pc
-       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk+,gdk}.pc
        $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}.la
 endef
 

diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile
index 972c563bb415f87116c71b62981054d56f0f2fbb..40c3fd6d3e0c2799012cf2d316c0799641e1a896 100644 (file)
--- a/XOrg/lib/gtk-2.8.20/Makefile
+++ b/XOrg/lib/gtk-2.8.20/Makefile
@@ -52,8 +52,6 @@ define Build/InstallDev
        $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*-2.0.pc
-       $(SED) "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/{gtk,gdk}*-2.0.pc
        $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}*-2.0.la
 endef
 

diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile
index 2635d204fc86eebdf7bf3f1b59b68af1bd07d216..ebbc70810dc6eb7942a6f2708a389963ff3f9dd1 100644 (file)
--- a/XOrg/lib/pango/Makefile
+++ b/XOrg/lib/pango/Makefile
@@ -56,9 +56,7 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       $(SED)  "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/pango*.pc
-       $(SED)  "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/pango*.pc
-       $(SED)  "s,Libs:,Libs: -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/ ,g" $(STAGING_DIR)/usr/lib/pkgconfig/pango*.pc
+       $(SED)  "s,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g" $(STAGING_DIR)/usr/lib/pkgconfig/pango*.pc
        $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libpango*.la
 endef
 

diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile
index 399d71f609165052d4e0440affe5299207bc8177..9bae552e0b80442abc623a0d138f0cf942ae4947 100644 (file)
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@@ -64,9 +64,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir}/alsa,-I$(STAGING_DIR)/usr/include/alsa,g' $(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/alsa.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 02d9cceba9366986da7e6fd8955797bf4d10fb9f..e4e008c43243938e0056d593ca8461578677a08e 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -140,8 +140,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/bluez-libs/Makefile b/libs/bluez-libs/Makefile
index 516c21291d6017c4f302953ba65e7078d338e1bc..adffcaf1f2420e346f91ce756c993d110703baa1 100644 (file)
--- a/libs/bluez-libs/Makefile
+++ b/libs/bluez-libs/Makefile
@@ -49,8 +49,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/bluez.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/bluez.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 3cc611cebb63f986fdc16ed825741942ba301731..73bdee26205386b0eff619a0f00b1516a25f3563 100644 (file)
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -92,8 +92,6 @@ define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/curl-config
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/libcurl.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/libcurl.pc
        $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/libcurl.pc
 endef
 

diff --git a/libs/dbus-glib/Makefile b/libs/dbus-glib/Makefile
index 04a3fd11e4197d1ca489bb067392d0de1f261200..a076290c3170be691b51d70302c8b99f44ae3e91 100644 (file)
--- a/libs/dbus-glib/Makefile
+++ b/libs/dbus-glib/Makefile
@@ -61,10 +61,6 @@ define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc \
                $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED)  's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' \
-               $(STAGING_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc
-       $(SED)  's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' \
-               $(STAGING_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile
index 929ba4ec96bd94c93ac2c0f74d4fc78040cdb448..e2106e02b080676be79ad7b4c99a04ae49a0374b 100644 (file)
--- a/libs/freetype/Makefile
+++ b/libs/freetype/Makefile
@@ -60,8 +60,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED) 's,-I$$$$includedir/freetype2,-I$(STAGING_DIR)/usr/include/freetype2,g' $(STAGING_DIR)/usr/bin/freetype-config
        $(SED) 's,/usr/include/freetype2/,$(STAGING_DIR)/usr/include/freetype2/,g' $(STAGING_DIR)/usr/bin/freetype-config
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 215af73d4ce8a7932e6176946c36f056abd9bd0c..81b3efbb64f61c187055301c9c52620644a6c6eb 100644 (file)
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -80,9 +80,6 @@ define Build/InstallDev
        $(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(STAGING_DIR)/usr/bin/glib-config
        $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(STAGING_DIR)/usr/bin/glib-config
        $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/glib-config
-       $(SED) 's,-I$$$${includedir}/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
-       $(SED) 's,-I$$$${libdir}/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(STAGING_DIR)/usr/bin/glib-config
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 4187e2fb764ed33a4d5ca29b0cc0c1014668a472..c6112ee0ae7589318aa9dfddd8b25f80c82336c9 100644 (file)
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -74,8 +74,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,object,thread}-2.0.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,module-no-export,object,thread}-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,module-no-export,object,thread}-2.0.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,module-no-export,object,thread}-2.0.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 022b5d8a9420d31bb68509dac8fc77f66c0d19ec..2d28a7334822ea88e36f7e3f67b5e4800f6d3dc3 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -158,8 +158,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/howl/Makefile b/libs/howl/Makefile
index f5c3dfabf52dc6e168224311cff5d991be93d0d8..618e4da7d59fd4cd1ddd8d76945c29525c70e9c9 100644 (file)
--- a/libs/howl/Makefile
+++ b/libs/howl/Makefile
@@ -101,8 +101,8 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I/usr/include,,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
-       $(SED) 's,-L/usr/lib/howl,,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
+       $(SED) 's,-I/usr/include,-I$$$${includedir},g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
+       $(SED) 's,-L/usr/lib/howl,-L$$$${libdir}/howl,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile
index 6b9d6a409b4727b349507c3f2da7610011865695..cd1313757431209fcf2a26ed94256eed6a502f8d 100644 (file)
--- a/libs/iksemel/Makefile
+++ b/libs/iksemel/Makefile
@@ -52,8 +52,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/iksemel.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/iksemel.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/iksemel.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libao/Makefile b/libs/libao/Makefile
index 5f64558b1366ba6a54cd4f9ced9a079c80b556a7..e23ee9ae86ec886220dcc9af7c7b44a0467b8a3f 100644 (file)
--- a/libs/libao/Makefile
+++ b/libs/libao/Makefile
@@ -57,8 +57,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ao.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ao.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libart/Makefile b/libs/libart/Makefile
index 45d7525ba6275f768095211a67a5799de703b6ad..9fad21f568912eaabbd17a5ca18631cfd2afb8c1 100644 (file)
--- a/libs/libart/Makefile
+++ b/libs/libart/Makefile
@@ -58,8 +58,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir}/libart-2.0,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libart-2.0.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libart-2.0.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile
index 8d02039594637d2b8dbf800baedc84c5ccbb0acb..27743ba4b072be17dd0e601f6cc3f78f588ccbc4 100644 (file)
--- a/libs/libaudiofile/Makefile
+++ b/libs/libaudiofile/Makefile
@@ -58,8 +58,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libdaemon/Makefile b/libs/libdaemon/Makefile
index a9b132395bbdde884ace3b1e130e1c6ef953df84..69f14d7a832b799a0ef96cef0a80131d45dceea7 100644 (file)
--- a/libs/libdaemon/Makefile
+++ b/libs/libdaemon/Makefile
@@ -62,8 +62,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile
index b22145debeb672bb82b6343f2951fa75b444835a..12512fb76c25f7bc910c2845786f720183722e26 100644 (file)
--- a/libs/libelf/Makefile
+++ b/libs/libelf/Makefile
@@ -50,8 +50,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libelf.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir}/libelf,-I$(STAGING_DIR)/usr/include/libelf,g' $(STAGING_DIR)/usr/lib/pkgconfig/libelf.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libelf.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index 00a37ca52309f45842413db81babded30dac703e..7cbc597e53affb29ccfbafe6b09830fd5af6af22 100644 (file)
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -80,9 +80,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgphoto2.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED) 's,-I$$$${prefix}/include/gphoto2,,g' $(STAGING_DIR)/usr/bin/gphoto2{,-port}-config
        $(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/gphoto2{,-port}-config
-       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
-       $(SED) 's,-I$$$${includedir}/gphoto2,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
        # remove annoying recursive symlink
        rm -f $(STAGING_DIR)/usr/include/gphoto2/gphoto2
 endef

diff --git a/libs/libmpd/Makefile b/libs/libmpd/Makefile
index c0ecd2baa706c618ec19915f8ba757231690bdc1..673041da349930c567eb3780b832b77116470196 100644 (file)
--- a/libs/libmpd/Makefile
+++ b/libs/libmpd/Makefile
@@ -39,8 +39,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpd.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libmpd.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libmpd.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile
index 7eb21a2e1381a3c5049a246b7493786dd67d8e4a..0bd56399789ab7edd1ccaca4dc54b6ee7e34f90b 100644 (file)
--- a/libs/libpng/Makefile
+++ b/libs/libpng/Makefile
@@ -55,7 +55,6 @@ define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config
-       $(SED) 's,-I$$$${includedir}/libpng12,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile
index 55beb3f43e4932aba7abe1b03b58e07ec2558618..ee1c47df0e413ec8db55ffc2f4bcfbc3e92b4942 100644 (file)
--- a/libs/libsigc++/Makefile
+++ b/libs/libsigc++/Makefile
@@ -65,8 +65,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/sigc++-2.0 $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
        $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc
 endef
 

diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index f2e4e27c385e4ac8df17420d105ed8125fa11677..256bafe0d449ea405a7a7960eb76896522546c92 100644 (file)
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -68,8 +68,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/libtorrent.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/libtorrent.pc
        $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/libtorrent.pc
 endef
 

diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
index 8a60ed9278e7c361fa1b88aed4cdfbf2acbc2564..2f25dcf238c08a062cfbc33c9b6c64e31e4f011a 100644 (file)
--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@@ -55,8 +55,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libupnp.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libupnp.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile
index 7dc7932cb4aa12692de36fc6f8db9f152a71f194..5fc4cd8079a1adf4017b02d4e25d40461fbb11b3 100644 (file)
--- a/libs/libusb/Makefile
+++ b/libs/libusb/Makefile
@@ -51,8 +51,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile
index b76097024461c159ef5a239d89c0c259883daee7..01f0fa7fd92002f409899539252078c8ae4bc8de 100644 (file)
--- a/libs/libxml2/Makefile
+++ b/libs/libxml2/Makefile
@@ -91,8 +91,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED) 's,-I$$$${includedir}/libxml2,-I$(STAGING_DIR)/usr/include/libxml2,g' $(STAGING_DIR)/usr/bin/xml2-config
        $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
-       $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
-       $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile
index 72b26b7503077b927a0f8a69a15d1b0feb46c5ff..f01b8d77645d62eb2149eabe16dc8c3b7a734f31 100644 (file)
--- a/libs/libxslt/Makefile
+++ b/libs/libxslt/Makefile
@@ -80,10 +80,6 @@ define Build/InstallDev
        $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xslt-config
        $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xslt-config
        $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xslt-config
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc
-       $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc
-       $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/neon/Makefile b/libs/neon/Makefile
index 8935a8c6aa0e43e07b0764339d2d72fc0b7ff633..c4f9c2ec1bc8395d99bd91720c2780489a621eaf 100644 (file)
--- a/libs/neon/Makefile
+++ b/libs/neon/Makefile
@@ -62,8 +62,6 @@ 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,"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/libs/speex/Makefile b/libs/speex/Makefile
index ddbc00fd49cd793a22c15a28293ed2d03ea67fb0..b8525713026e7bdecc7d59354b60211ae3d6b6be 100644 (file)
--- a/libs/speex/Makefile
+++ b/libs/speex/Makefile
@@ -65,8 +65,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile
index 1a0df76a936b6054de73950f6f84bd31e955945d..edd3edd338b02a6b86e6ea081debdfef3810d435 100644 (file)
--- a/libs/sqlite2/Makefile
+++ b/libs/sqlite2/Makefile
@@ -83,8 +83,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc
 endef
 
 define Build/UninstallDev

diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index a65f4d60c34a9bd8597dff7347a977b5c2d91525..0d2cee9e16d98789518ab54a44a95acee9a8620a 100644 (file)
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -82,8 +82,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
-       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
 endef
 
 define Build/UninstallDev

diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile
index 314bb0ddb01dbfcd84beaf44d4c716d83fa127d9..f926b1f5acf672ad8a64ba4d36be69bdb2f4871d 100644 (file)
--- a/utils/apr-util/Makefile
+++ b/utils/apr-util/Makefile
@@ -65,9 +65,6 @@ define Build/InstallDev
                $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
                $(STAGING_DIR)/usr/lib/pkgconfig/
        $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-1-config
-       $(SED)  "s,bindir\=\"/usr/bin\",bindir\=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apu-1-config
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-1.la
-       
 endef
 
 define Build/UninstallDev

diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile
index 79c8ad9a172d7cab5ecc13e2b62b2645c11ed690..3858361f4108b620ac3dc3ea99597231c4a36513 100644 (file)
--- a/utils/dbus/Makefile
+++ b/utils/dbus/Makefile
@@ -101,10 +101,6 @@ define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \
                $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED)  's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' \
-               $(STAGING_DIR)/usr/lib/pkgconfig/dbus-1.pc
-       $(SED)  's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' \
-               $(STAGING_DIR)/usr/lib/pkgconfig/dbus-1.pc
 endef
 
 define Build/UninstallDev