From: blogic Date: Sat, 6 Oct 2007 23:51:22 +0000 (+0000) Subject: added our own pkg-config wrapper, making the sed foo on *.pc files obselete 2/2 X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=ef6b16d4d51d0675261ede95d8e4e53ad73dfc9d;p=packages.git added our own pkg-config wrapper, making the sed foo on *.pc files obselete 2/2 git-svn-id: svn://svn.openwrt.org/openwrt/packages@9163 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile index 771a52d14..414e73d6c 100644 --- 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 b0fb539c8..902a6ecee 100644 --- 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 8593ec55a..31f5e327d 100644 --- 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 56796dc74..ccd8a4d33 100644 --- 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 972c563bb..40c3fd6d3 100644 --- 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 2635d204f..ebbc70810 100644 --- 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 399d71f60..9bae552e0 100644 --- 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 02d9cceba..e4e008c43 100644 --- 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 516c21291..adffcaf1f 100644 --- 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 3cc611ceb..73bdee262 100644 --- 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 04a3fd11e..a076290c3 100644 --- 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 929ba4ec9..e2106e02b 100644 --- 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 215af73d4..81b3efbb6 100644 --- 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 4187e2fb7..c6112ee0a 100644 --- 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 022b5d8a9..2d28a7334 100644 --- 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 f5c3dfabf..618e4da7d 100644 --- 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 6b9d6a409..cd1313757 100644 --- 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 5f64558b1..e23ee9ae8 100644 --- 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 45d7525ba..9fad21f56 100644 --- 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 8d0203959..27743ba4b 100644 --- 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 a9b132395..69f14d7a8 100644 --- 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 b22145deb..12512fb76 100644 --- 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 00a37ca52..7cbc597e5 100644 --- 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 c0ecd2baa..673041da3 100644 --- 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 7eb21a2e1..0bd563997 100644 --- 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 55beb3f43..ee1c47df0 100644 --- 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 f2e4e27c3..256bafe0d 100644 --- 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 8a60ed927..2f25dcf23 100644 --- 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 7dc7932cb..5fc4cd807 100644 --- 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 b76097024..01f0fa7fd 100644 --- 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 72b26b750..f01b8d776 100644 --- 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 8935a8c6a..c4f9c2ec1 100644 --- 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 ddbc00fd4..b85257130 100644 --- 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 1a0df76a9..edd3edd33 100644 --- 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 a65f4d60c..0d2cee9e1 100644 --- 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 314bb0ddb..f926b1f5a 100644 --- 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 79c8ad9a1..3858361f4 100644 --- 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