diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-11-11 18:18:43 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-11-11 18:18:43 +0000 |
| commit | 69c922f5d27ea1fef4f67ed8b143540b0e33c364 (patch) | |
| tree | c1d34157e6d1f84bbb18ab496d70e31c9af4cf16 /Makefile.org | |
| parent | 10c85057348cf34d0d55cba90904fb37f1a124f6 (diff) | |
| download | openssl-new-69c922f5d27ea1fef4f67ed8b143540b0e33c364.tar.gz | |
Some find it confusing that environment variables are set when shared
libraries aren't built or used. I can see the point, so I'm
reorganising a little for clarity.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/Makefile.org b/Makefile.org index a381960801..8059909453 100644 --- a/Makefile.org +++ b/Makefile.org @@ -403,18 +403,20 @@ dclean: rehash: rehash.time rehash.time: certs @(OPENSSL="`pwd`/apps/openssl$(EXE_EXT)"; OPENSSL_DEBUG_MEMORY=on; \ - export OPENSSL OPENSSL_DEBUG_MEMORY; \ - 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; \ - if [ -n "$(SHARED_LIBS)" ]; then \ - LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ - export LD_PRELOAD; \ - fi; \ - $(PERL) tools/c_rehash certs) + export OPENSSL OPENSSL_DEBUG_MEMORY; \ + if [ -n "$(SHARED_LIBS)" ]; then \ + 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; \ + LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ + export LD_PRELOAD; \ + fi; \ + $(PERL) tools/c_rehash certs) touch rehash.time test: tests @@ -422,14 +424,14 @@ test: tests tests: rehash @(cd test && echo "testing..." && \ $(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); - @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; \ - if [ -n "$(SHARED_LIBS)" ]; then \ + @if [ -n "$(SHARED_LIBS)" ]; then \ + 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; \ LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ export LD_PRELOAD; \ fi; \ apps/openssl version -a |