summaryrefslogtreecommitdiff
path: root/package/openssl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:32:55 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 15:32:55 +0100
commit3d45df344602687c8983f5fb609721aa8ca2469f (patch)
treebd089044e1402b116cf6447eda74e81b7f65d129 /package/openssl
parent897be7157eb98898fdc62224857025d4a0f01dd5 (diff)
rework PKG_FLAVOURS. Subpackages can have flavours, so
always add PKG_NAME to PKG_FLAVOURS variable. ala PKG_FLAVOURS_LIBNCURSES. Bug reported by Phil Sutter.
Diffstat (limited to 'package/openssl')
-rw-r--r--package/openssl/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 0d30b8f63..472362adc 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -22,9 +22,8 @@ PKGSD_LIBOPENSSL_DEV:= development files for openssl
PKGSC_LIBOPENSSL_DEV:= devel
PKGSS_LIBOPENSSL_DEV:= libopenssl
-PKG_FLAVOURS:= WITH_EC
-PKGFD_WITH_EC:= enable Elliptic Curve crypto
-PKGSUB_WITH_EC:= libopenssl
+PKG_FLAVOURS_LIBOPENSSL:= WITH_EC
+PKGFD_WITH_EC:= enable Elliptic Curve crypto
include ${TOPDIR}/mk/package.mk
@@ -40,7 +39,7 @@ FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST}
OPENSSL_OPTIONS:= shared no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
-ifeq ($(ADK_PACKAGE_OPENSSL_WITH_EC),)
+ifeq ($(ADK_PACKAGE_LIBOPENSSL_WITH_EC),)
OPENSSL_OPTIONS+= no-ec
endif