summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2003-03-20 12:37:47 +0100
committerRichard Levitte <levitte@openssl.org>2003-03-20 12:37:47 +0100
commit48f1fa7482efbbc9d6b8e33c619fa5e2921d1e17 (patch)
tree832a8378e0b9d39228b328839e798b42f97bcd1d /apps
parenthinv may generate more than one line (1 line per CPU). (diff)
downloadopenssl-48f1fa7482efbbc9d6b8e33c619fa5e2921d1e17.tar.xz
openssl-48f1fa7482efbbc9d6b8e33c619fa5e2921d1e17.zip
Make sure that all the library paths are modified in prepend mode, not
replace mode. PR: 528
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile.ssl5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 593c9a5ac9..168fb06233 100644
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -168,7 +168,10 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
LIBRPATH=$(INSTALLTOP)/lib \
link_app.$${shlib_target}
-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \
- LIBPATH="`pwd`"; LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; \
+ LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
+ DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
+ SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
+ LIBPATH="`pwd`:$$LIBPATH"; \
if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
$(PERL) tools/c_rehash certs)