Cut'n'paste mistake. All tested OK now...
authorRichard Levitte <levitte@openssl.org>
Thu, 11 Nov 2004 19:36:08 +0000 (19:36 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 11 Nov 2004 19:36:08 +0000 (19:36 +0000)
Makefile.org
apps/Makefile.ssl

index 80599094534d703227f833c03b7383ed65827a1b..57f71f5abc30bf925dc8c2fe38a36bb9d9a7492f 100644 (file)
@@ -412,7 +412,7 @@ rehash.time: certs
            if [ "$(PLATFORM)" = "Cygwin" ]; then \
              PATH="`pwd`:$$PATH"; \
            fi; \
            if [ "$(PLATFORM)" = "Cygwin" ]; then \
              PATH="`pwd`:$$PATH"; \
            fi; \
-           LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+           LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
            export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
            export LD_PRELOAD; \
          fi; \
            export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
            export LD_PRELOAD; \
          fi; \
@@ -430,7 +430,7 @@ tests: rehash
          SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
          LIBPATH="`pwd`:$$LIBPATH"; \
          if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
          SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
          LIBPATH="`pwd`:$$LIBPATH"; \
          if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
-         LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+         LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
          export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
          export LD_PRELOAD; \
        fi; \
          export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
          export LD_PRELOAD; \
        fi; \
index 3f31dde71f06fbfb7d0c82b19666e401340a83c7..9f6356c8f1f95297621a873dc83f7c2c8aae2571 100644 (file)
@@ -179,7 +179,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
            if [ "$(PLATFORM)" = "Cygwin" ]; then \
              PATH="`pwd`:$$PATH"; \
            fi; \
            if [ "$(PLATFORM)" = "Cygwin" ]; then \
              PATH="`pwd`:$$PATH"; \
            fi; \
-           LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+           LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
            export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
            export LD_PRELOAD; \
          fi; \
            export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
            export LD_PRELOAD; \
          fi; \