diff options
| author | Rob Austein <sra@hactrn.net> | 2011-01-20 13:41:20 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-01-20 13:41:20 +0000 |
| commit | 81fbac5c5165e53236b821e9238aafeebc4076fd (patch) | |
| tree | 1f837a9eb445285621634651238f9dd417d6f96f /openssl/Makefile.in | |
| parent | 3debee4485f6668dcc3e74fac26163350edfdd22 (diff) | |
Fix all the broken RPATH stuff we said we'd fix "some day".
svn path=/configure; revision=3615
Diffstat (limited to 'openssl/Makefile.in')
| -rw-r--r-- | openssl/Makefile.in | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 9c0a0f06..21daf3eb 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -2,27 +2,31 @@ VERSION = 1.0.0b -OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ -OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl -OPENSSL_SHARED_LIBRARY_DIR = @OPENSSL_SHARED_LIBRARY_DIR@ - -# Kludge alert: -# -# 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. +OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ +OPENSSL_BUILD_DIRECTORY = ${abs_builddir}/openssl +PYWRAP_LIBDIR = @PYWRAP_LIBDIR@ + +abs_top_srcdir = @abs_top_srcdir@ +abs_top_builddir = @abs_top_builddir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +libdir = @libdir@ # We need to build with enable-shared whether we're really trying to # build shared OpenSSL libraries or not, because _POW.so requires # position independent code, so we need OpenSSL compiled with the -# options it would use for a shared library. +# options it would use for a shared library. This then requires +# further gymnastics to get an openssl executable linked against the +# static libraries, which we want so that we don't have to set +# LD_LIBRARY_PATH in all of our test scripts. -OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${OPENSSL_BUILD_DIRECTORY} +OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${prefix} all: openssl-${VERSION}/Makefile - cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${OPENSSL_BUILD_DIRECTORY} + cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${PYWRAP_LIBDIR} + cd openssl-${VERSION}; mkdir disabled; mv -fv *.so* disabled + cd openssl-${VERSION}; rm apps/openssl; cd apps; ${MAKE} $@ + cd openssl-${VERSION}; mv -fv disabled/* .; rmdir disabled ln -sf openssl-${VERSION} openssl clean: |