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 --- package/openssl/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'package/openssl') 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 -- cgit v1.2.3