diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-20 13:58:26 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-21 22:08:41 +0100 |
| commit | 51cf21343eecc2a3b5a627a14a1874c2977e3d27 (patch) | |
| tree | 49a857af7054422e4879ea3155017a0fe7c8141f /rules/openssl.make | |
| parent | e7fbc7a4355f17baa32c71851dfb9bb8c8575d07 (diff) | |
| download | ptxdist-51cf21343eecc2a3b5a627a14a1874c2977e3d27.tar.gz ptxdist-51cf21343eecc2a3b5a627a14a1874c2977e3d27.tar.xz | |
[openssl] cleanup prepare
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/openssl.make')
| -rw-r--r-- | rules/openssl.make | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/rules/openssl.make b/rules/openssl.make index da1fa0aa5..905fca746 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -38,8 +38,7 @@ $(OPENSSL_SOURCE): # Prepare # ---------------------------------------------------------------------------- -OPENSSL_PATH := PATH=$(CROSS_PATH) -OPENSSL_ENV := $(CROSS_ENV) +OPENSSL_CONF_ENV := $(CROSS_ENV) OPENSSL_MAKE_PAR := NO OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I386) += debian-i386 @@ -74,22 +73,22 @@ endif # # autoconf # -OPENSSL_AUTOCONF := \ +OPENSSL_CONF_OPT := \ --prefix=/usr \ --openssldir=/usr/lib/ssl \ --install_prefix=$(OPENSSL_PKGDIR) ifdef PTXCONF_OPENSSL_SHARED -OPENSSL_AUTOCONF += shared +OPENSSL_CONF_OPT += shared else -OPENSSL_AUTOCONF += no-shared +OPENSSL_CONF_OPT += no-shared endif $(STATEDIR)/openssl.prepare: @$(call targetinfo) cd $(OPENSSL_DIR) && \ - $(OPENSSL_PATH) $(OPENSSL_ENV) \ - ./Configure $(OPENSSL_ARCH-y) $(OPENSSL_AUTOCONF) + $(OPENSSL_PATH) $(OPENSSL_CONF_ENV) \ + ./Configure $(OPENSSL_ARCH-y) $(OPENSSL_CONF_OPT) @$(call touch) # ---------------------------------------------------------------------------- |