diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-06-14 12:29:34 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-06-14 12:29:34 +0000 |
| commit | 30fc34625c71f4242e232e45fec53fdf267f0adf (patch) | |
| tree | 81da9eb74ed8dd2d059d766659b7dcb3afd3ec42 /apps | |
| parent | 18f3210a353a2529f43a1dcf65ac3aa2b96084c3 (diff) | |
Make sure detached fingerprints are installed [as well as minor cygwin
and hpux updates].
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/apps/Makefile b/apps/Makefile index dd2f1d0af5..5ca70480e7 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -101,8 +101,17 @@ install: (echo installing $$i; \ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ - done; + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new \ + $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ + sig="$$i.$${HMAC_EXT:-sha1}"; \ + if [ -f $$sig ]; then \ + echo installing $$sig; \ + cp $$sig $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$sig.new; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$sig.new; \ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$sig.new \ + $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$sig; \ + fi; \ + ) done; @for i in $(SCRIPTS); \ do \ (echo installing $$i; \ @@ -143,16 +152,20 @@ $(DLIBCRYPTO): $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) $(RM) $(EXE) + SHARED_LIBS="$(SHARED_LIBS)"; \ if [ "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \ + SHARED_LIBS=""; \ + fi; \ + if [ -z "$(SHARED_LIBS)" ]; then \ set -x; $${CC:-$(CC)} -o $(EXE) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(DLIBSSL) $(LIBKRB5) $(DLIBCRYPTO) $(EX_LIBS) ; \ - elif [ -z "$(SHARED_LIBS)" ]; then \ - set -x; $${CC:-$(CC)} -o $(EXE) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS) ; \ else \ set -x; LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \ $(CC) -o $(EXE) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS) ; \ - fi - if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ - TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a $(EXE); \ + fi; \ + if [ -z "$$SHARED_LIBS" ]; then \ + if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ + TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a $(EXE); \ + fi; \ fi -(cd ..; \ OPENSSL="`pwd`/util/opensslwrap.sh"; export OPENSSL; \ |