Make sure that all the library paths are modified in prepend mode, not

replace mode.
PR: 528

diff --git a/Makefile.org b/Makefile.org
index b947fcbefb5ec0ce0349c18a466d653ba7c6ee2e..68e8fae92895b126534070caf3e998ae8f288542 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -652,7 +652,10 @@ rehash: rehash.time
 rehash.time: certs
        @(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \
                export OPENSSL OPENSSL_DEBUG_MEMORY; \
-               LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`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)
@@ -663,10 +666,13 @@ test:   tests
 tests: rehash
        @(cd test && echo "testing..." && \
        $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
-       @LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
-               if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
-               export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
-               apps/openssl version -a
+       @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; \
+       apps/openssl version -a
 
 report:
        @$(PERL) util/selftest.pl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index ff433d6a80d51c65977a18a98a5214174a291976..921ba460ea6ad6ca31ebfa97a9ae4715a97f805e 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -150,7 +150,10 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
          $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS) ; \
        fi
        -(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)

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 21ec82dd595f14aadb3711386cacbefa0e75397d..ffd4184627f0ea3b56c803121aa5f8a34eb26944 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -121,7 +121,11 @@ tests:     exe apps $(TESTS)
 apps:
        @(cd ..; $(MAKE) DIRS=apps all)
 
-SET_SO_PATHS=LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH="$$LIBPATH"; DYLD_LIBRARY_PATH="$$LIBPATH"; SHLIB_PATH="$$LIBPATH"; \
+SET_SO_PATHS=OSSL_LIBPATH="`cd ..; pwd`"; \
+               LD_LIBRARY_PATH="$$OSSL_LIBPATH:$$LD_LIBRARY_PATH"; \
+               DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \
+               SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \
+               LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \
                if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \
                export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH