From: Richard Levitte <levitte@openssl.org>
Date: Thu, 11 Nov 2004 19:36:25 +0000 (+0000)
Subject: Cut'n'paste mistake.  All tested OK now...
X-Git-Tag: BEN_FIPS_TEST_6~54
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=671c1bcfce6a030cb94ad6e55094d6de347cbbdb;p=oweals%2Fopenssl.git

Cut'n'paste mistake.  All tested OK now...
---

diff --git a/Makefile.org b/Makefile.org
index 0b661ab729..a4349087b5 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -689,7 +689,7 @@ rehash.time: certs
 	    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; \
@@ -707,7 +707,7 @@ tests: rehash
 	  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; \
diff --git a/apps/Makefile b/apps/Makefile
index c014e154e6..cfd5f4e514 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -162,7 +162,7 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
 	    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; \