fixes for common config functions

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 1b7ead8..78e17a2 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -20,7 +20,27 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
 
 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
 

-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libopenssl
+SECTION:=base
+CATEGORY:=Libraries
+TITLE:=Open source SSL libraries
+DEPENDS:=+zlib
+DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
+URL:=http://www.openssl.org/
+endef
+
+define Package/openssl-util
+$(call Package/libopenssl)
+DEPENDS:=libopenssl
+TITLE:=OpenSSL command line utilities
+DESCRIPTION:=OpenSSL command line utilities
+endef
+
+define Package/openssl-util/conffiles
+/etc/ssl/openssl.cnf
+endef

 
 define Build/Configure
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
 
 define Build/Configure
        $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure


@@ -68,28 +88,10 @@ define Build/InstallDev
 endef
        
 define Build/UninstallDev
 endef
        
 define Build/UninstallDev

-       rm -rf \
-               $(STAGING_DIR)/usr/include/openssl \
+       rm -rf  $(STAGING_DIR)/usr/include/openssl \

                $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef
 
                $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef
 

-
-define Package/libopenssl
- SECTION:=base
- CATEGORY:=Libraries
- TITLE:=Open source SSL libraries
- DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
- URL:=http://www.openssl.org/
-endef
-
-define Package/openssl-util
- $(call Package/libopenssl)
- DEPENDS:=libopenssl
- TITLE:=OpenSSL command line utilities
- DESCRIPTION:=OpenSSL command line utilities
-endef
-
-

 define Package/libopenssl/install
        install -d -m0755 $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
 define Package/libopenssl/install
        install -d -m0755 $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/


@@ -106,6 +108,5 @@ define Package/openssl-util/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/
 endef
 

-

 $(eval $(call BuildPackage,libopenssl))
 $(eval $(call BuildPackage,openssl-util))
 $(eval $(call BuildPackage,libopenssl))
 $(eval $(call BuildPackage,openssl-util))