diff options
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/Makefile.in (renamed from openssl/Makefile) | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/openssl/Makefile b/openssl/Makefile.in index 48170b6c..14a5bcb3 100644 --- a/openssl/Makefile +++ b/openssl/Makefile.in @@ -2,11 +2,11 @@ # Kludge alert: # -# The --prefix=`pwd` and LIBRPATH=`pwd` settings below are to force -# OpenSSL's baroque configuration mechanism to build shared libraries -# that will run out of the build tree. This is temporary. Once we -# write "make install" code, we'll have to change that to point to the -# directory where the OpenSSL shared libraries will be installed. +# The --prefix= and LIBRPATH= settings below are to force OpenSSL's +# baroque configuration mechanism to build shared libraries that will +# run out of the build tree. This is temporary. Once we write "make +# install" code, we'll have to change that to point to the directory +# where the OpenSSL shared libraries will be installed. # # I would have avoided shared libraries entirely if I could, but the # GNU linker isn't able to build POW (see ../pow/) from static @@ -17,10 +17,14 @@ VERSION = 1.0.0-beta5 -OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=`pwd` +OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ + +OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl + +OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${OPENSSL_BUILD_DIRECTORY} all: openssl-${VERSION}/Makefile - cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=`pwd` + cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${OPENSSL_BUILD_DIRECTORY} ln -sf openssl-${VERSION} openssl clean: @@ -32,8 +36,7 @@ clean: # case it's probably easier to use ./Configure. openssl-${VERSION}/Makefile: openssl-${VERSION}/config - cd openssl-${VERSION}; PERL=/usr/bin/perl ./config ${OPTIONS} -# cd openssl-${VERSION}; PERL=/usr/bin/perl ./Configure debug-BSD-x86-elf ${OPTIONS} + cd openssl-${VERSION}; PERL=/usr/bin/perl ${OPENSSL_CONFIG_COMMAND} ${OPTIONS} cd openssl-${VERSION}; ${MAKE} depend openssl-${VERSION}/config: openssl-${VERSION}.tar.gz |