summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-02-29 18:34:42 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-02-29 18:46:38 +0100
commit7c4f2ec8a795534164ee1923093b7d5be0126c55 (patch)
tree08971f4c7375629393b6d9cdeb713006778334bf /openssl
parent8c9823d311fdf8092cc75873e4565325d204a658 (diff)
Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name, so that external modules can configure --prefix=/@___... etc. This removes the need for the special extshl and EXTRPATH=LOADER. Also, a new OUT2BIN_NONE can be used for external modules where the generated libraries need the default EXTRPATH=OOO, but generated executables are only used during the build and such need RPATH=NONE.
Diffstat (limited to 'openssl')
-rw-r--r--openssl/makefile.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index dcbf04e8075c..666a2025ad9e 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -60,6 +60,11 @@ CONFIGURE_FLAGS=shared no-idea
CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
.ENDIF
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+ --prefix=/@.__________________________________________________$(EXTRPATH)
+.END
+
BUILD_DIR=.
COMPILER_AND_FLAGS=$(CC)