From fa7fcec9cfd77981b585ef9cf1328bbf0620dc62 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 6 Oct 2007 23:50:47 +0000 Subject: added our own pkg-config wrapper, making the sed foo on *.pc files obselete 1/2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9162 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/e2fsprogs/Makefile | 2 -- package/libjson-c/Makefile | 2 -- package/openssl/Makefile | 2 -- 3 files changed, 6 deletions(-) (limited to 'package') diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 16102907a..06db69d06 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -101,8 +101,6 @@ define Build/InstallDev BUILDCC="$(HOSTCC)" \ DESTDIR="$(1)" \ install-libs - $(SED) 's,-I$$$${includedir},,g' $(1)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc - $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc endef define Build/UninstallDev diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile index c2adc7c90..01116aaf6 100644 --- a/package/libjson-c/Makefile +++ b/package/libjson-c/Makefile @@ -42,8 +42,6 @@ define Build/InstallDev $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/ mkdir -p $(1)/usr/lib/pkgconfig $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${includedir}/,-I$(1)/usr/include/,g' $(1)/usr/lib/pkgconfig/json.pc - $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/json.pc endef define Build/UninstallDev diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 270fe5e75..555099bd0 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -115,8 +115,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/ mkdir -p $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's,^includedir=.*,includedir=$(1)/usr/include,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc - $(SED) 's,^libdir=.*,libdir=$(1)/usr/lib,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc endef -- cgit v1.2.3