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 /apps | |
| parent | 10c85057348cf34d0d55cba90904fb37f1a124f6 (diff) | |
| download | openssl-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 'apps')
| -rw-r--r-- | apps/Makefile.ssl | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index e7bb8d7649..b85c675b50 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -169,18 +169,21 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBRPATH=$(INSTALLTOP)/lib \ link_app.$${shlib_target} - -(cd ..; OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \ - 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) + -(cd ..; + if [ -n "$(SHARED_LIBS)" ]; then \ + OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \ + 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) progs.h: progs.pl $(PERL) progs.pl $(E_EXE) >progs.h |