From 640652a244c6916ea5c2a886c52d477d5742e0d8 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 28 Sep 2007 01:45:11 +0000 Subject: add $(STAGING_DIR) as argument to the InstallDev template and update packages accordingly - this way we can reuse InstallDev to automatically generate UninstallDev or create -dev packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9052 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++-- package/e2fsprogs/Makefile | 6 +++--- package/fuse/Makefile | 22 +++++++++---------- package/gmp/Makefile | 12 +++++------ package/iptables/Makefile | 24 ++++++++++----------- package/keynote/Makefile | 12 +++++------ package/libjson-c/Makefile | 22 +++++++++---------- package/libpcap/Makefile | 12 +++++------ package/linux-atm/Makefile | 12 +++++------ package/mac80211/Makefile | 6 +++--- package/madwifi/Makefile | 10 ++++----- package/ncurses/Makefile | 48 ++++++++++++++++++++--------------------- package/nvram/Makefile | 6 +++--- package/openssl/Makefile | 24 ++++++++++----------- package/wireless-tools/Makefile | 14 ++++++------ package/zlib/Makefile | 12 +++++------ 16 files changed, 123 insertions(+), 123 deletions(-) diff --git a/include/package.mk b/include/package.mk index 9090455658..2b93972f24 100644 --- a/include/package.mk +++ b/include/package.mk @@ -64,7 +64,7 @@ define Build/DefaultTargets $(STAMP_BUILT): $(STAMP_CONFIGURED) $(Build/Compile) - $(Build/InstallDev) + $(call Build/InstallDev,$(STAGING_DIR)) touch $$@ ifdef Build/InstallDev @@ -142,7 +142,7 @@ configure: $(STAMP_CONFIGURED) compile: install: clean: FORCE - $(Build/UninstallDev) + $(call Build/UninstallDev,$(STAGING_DIR)) $(Build/Clean) @rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed @rm -rf $(PKG_BUILD_DIR) diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1bcb6592c9..16102907ae 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -99,10 +99,10 @@ endef define Build/InstallDev $(MAKE) -C $(PKG_BUILD_DIR) \ BUILDCC="$(HOSTCC)" \ - DESTDIR="$(STAGING_DIR)" \ + DESTDIR="$(1)" \ install-libs - $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc + $(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/fuse/Makefile b/package/fuse/Makefile index d0334499a7..927c35016e 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -106,20 +106,20 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc + $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/fuse{,.h} \ - $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \ - $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc + rm -rf $(1)/usr/include/fuse{,.h} \ + $(1)/usr/lib/libfuse.{a,so*} \ + $(1)/usr/lib/pkgconfig/fuse.pc endef define Package/fuse-utils/install diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 978f7db3d9..aff46a933e 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -39,15 +39,15 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/gmp* \ - $(STAGING_DIR)/usr/lib/libgmp.{a,so*} + rm -rf $(1)/usr/include/gmp* \ + $(1)/usr/lib/libgmp.{a,so*} endef define Package/libgmp/install diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 94c81ba383..01055305d6 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -222,22 +222,22 @@ define Build/InstallDev $(TARGET_CONFIGURE_OPTS) \ COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ - DESTDIR="$(STAGING_DIR)" \ + DESTDIR="$(1)" \ install-devel - $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr - $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/include $(1)/usr + $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/libipq.h - rm -rf $(STAGING_DIR)/usr/include/libipulog - rm -rf $(STAGING_DIR)/usr/include/libipq - rm -rf $(STAGING_DIR)/usr/include/libiptc - rm -rf $(STAGING_DIR)/usr/include/linux/netfilter* - rm -rf $(STAGING_DIR)/usr/include/iptables* - rm -rf $(STAGING_DIR)/usr/include/ip6tables* - rm -rf $(STAGING_DIR)/usr/lib/libipq.a - rm -rf $(STAGING_DIR)/usr/lib/libiptc.a + rm -rf $(1)/usr/include/libipq.h + rm -rf $(1)/usr/include/libipulog + rm -rf $(1)/usr/include/libipq + rm -rf $(1)/usr/include/libiptc + rm -rf $(1)/usr/include/linux/netfilter* + rm -rf $(1)/usr/include/iptables* + rm -rf $(1)/usr/include/ip6tables* + rm -rf $(1)/usr/lib/libipq.a + rm -rf $(1)/usr/lib/libiptc.a endef define Package/iptables/install diff --git a/package/keynote/Makefile b/package/keynote/Makefile index 9fe38678dd..1aea7cbc60 100644 --- a/package/keynote/Makefile +++ b/package/keynote/Makefile @@ -41,15 +41,15 @@ MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/keynote - $(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(STAGING_DIR)/usr/include/keynote/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libkeynote.a $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include/keynote + $(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(1)/usr/include/keynote/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libkeynote.a $(1)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/keynote \ - $(STAGING_DIR)/usr/lib/libkeynote.a + rm -rf $(1)/usr/include/keynote \ + $(1)/usr/lib/libkeynote.a endef define Package/keynote/install diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile index c11bf085b4..c2adc7c90a 100644 --- a/package/libjson-c/Makefile +++ b/package/libjson-c/Makefile @@ -36,20 +36,20 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) -r $(PKG_INSTALL_DIR)/usr/include/json $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${includedir}/,-I$(STAGING_DIR)/usr/include/,g' $(STAGING_DIR)/usr/lib/pkgconfig/json.pc - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/json.pc + mkdir -p $(1)/usr/include + $(CP) -r $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(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 - rm -rf $(STAGING_DIR)/usr/include/json \ - $(STAGING_DIR)/usr/lib/libjson.{a,so*} \ - $(STAGING_DIR)/usr/lib/pkgconfig/json.pc + rm -rf $(1)/usr/include/json \ + $(1)/usr/lib/libjson.{a,so*} \ + $(1)/usr/lib/pkgconfig/json.pc endef define Package/libjson/install diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 67719b8943..bd039f911d 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -46,17 +46,17 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap{,-bpf,-namedb}.h \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \ - $(STAGING_DIR)/usr/lib/ + $(1)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/pcap{,-bpf,-namedb}.h \ - $(STAGING_DIR)/usr/lib/libpcap.{a,so*} + rm -rf $(1)/usr/include/pcap{,-bpf,-namedb}.h \ + $(1)/usr/lib/libpcap.{a,so*} endef define Package/libpcap/install diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index d86709bd26..000ea5c700 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -55,17 +55,17 @@ endef ifneq ($(CONFIG_PACKAGE_linux-atm),) define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \ - $(STAGING_DIR)/usr/lib/ + $(1)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/atm{,d,sap}.h \ - $(STAGING_DIR)/usr/lib/libatm.{a,so*} + rm -rf $(1)/usr/include/atm{,d,sap}.h \ + $(1)/usr/lib/libatm.{a,so*} endef endif diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 66a530d037..63d7fff475 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -62,12 +62,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/mac80211 - $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(STAGING_DIR)/usr/include/mac80211/ + mkdir -p $(1)/usr/include/mac80211 + $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(1)/usr/include/mac80211/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/mac80211 + rm -rf $(1)/usr/include/mac80211 endef $(eval $(call KernelPackage,mac80211)) diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 64d076bb4e..06b3bb6c58 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -143,14 +143,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/madwifi - $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ - mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211 - $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ + mkdir -p $(1)/usr/include/madwifi + $(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/ + mkdir -p $(1)/usr/include/madwifi/net80211 + $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/madwifi + rm -rf $(1)/usr/include/madwifi endef define KernelPackage/madwifi/install diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index f51c233aec..6da4299e81 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -140,34 +140,34 @@ define Package/libncurses/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/include/curses.h \ - $(STAGING_DIR)/usr/include/ncurses.h \ - $(STAGING_DIR)/usr/include/ncurses_dll.h \ - $(STAGING_DIR)/usr/include/menu.h \ - $(STAGING_DIR)/usr/include/panel.h \ - $(STAGING_DIR)/usr/include/term{,cap}.h \ - $(STAGING_DIR)/usr/include/unctrl.h \ - $(STAGING_DIR)/usr/include/form.h \ - $(STAGING_DIR)/usr/include/eti.h \ - $(STAGING_DIR)/usr/lib/libcurses.so \ - $(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} + $(1)/usr/include/curses.h \ + $(1)/usr/include/ncurses.h \ + $(1)/usr/include/ncurses_dll.h \ + $(1)/usr/include/menu.h \ + $(1)/usr/include/panel.h \ + $(1)/usr/include/term{,cap}.h \ + $(1)/usr/include/unctrl.h \ + $(1)/usr/include/form.h \ + $(1)/usr/include/eti.h \ + $(1)/usr/lib/libcurses.so \ + $(1)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} endef $(eval $(call BuildPackage,libncurses)) diff --git a/package/nvram/Makefile b/package/nvram/Makefile index cc1371ec64..2bcc3afcf4 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -30,12 +30,12 @@ define Build/Prepare endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/ endef define Build/UninstallDev - rm -f $(STAGING_DIR)/usr/lib/lib{nvram,shared}*.so + rm -f $(1)/usr/lib/lib{nvram,shared}*.so endef define Package/nvram/install diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 36b5b24e27..270fe5e755 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -109,21 +109,21 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,^includedir=.*,includedir=$(STAGING_DIR)/usr/include,g' $(STAGING_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc - $(SED) 's,^libdir=.*,libdir=$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc - $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(1)/usr/include/ + mkdir -p $(1)/usr/lib/ + $(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 define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/openssl \ - $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \ - $(STAGING_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc + rm -rf $(1)/usr/include/openssl \ + $(1)/usr/lib/lib{crypto,ssl}.{a,so*} \ + $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc endef define Package/libopenssl/install diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 6582af12d2..3e997a176c 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -49,16 +49,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/ - ln -sf libiw.so.$(PKG_VERSION) $(STAGING_DIR)/usr/lib/libiw.so + mkdir -p $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libiw.so* $(1)/usr/lib/ + ln -sf libiw.so.$(PKG_VERSION) $(1)/usr/lib/libiw.so endef define Build/UninstallDev - rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \ - $(STAGING_DIR)/usr/lib/libiw.so* + rm -f $(1)/usr/include/{iwlib,wireless}.h \ + $(1)/usr/lib/libiw.so* endef define Package/wireless-tools/install diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 15407d5a3f..293462528f 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -49,17 +49,17 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \ - $(STAGING_DIR)/usr/lib/ + $(1)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h \ - $(STAGING_DIR)/usr/lib/libz.{a,so*} + rm -rf $(1)/usr/include/z{conf,lib}.h \ + $(1)/usr/lib/libz.{a,so*} endef # libz.so is needed for openssl (zlib-dynamic) -- cgit v1.2.3