We stupidly had a separate LIBKRB5 variable for KRB5 library dependencies,

[openssl.git] / apps / Makefile.ssl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index f1a4ad0fde3f8b59e926d8340ce1accf5cfc257e..6b86302c2ddb38fdd091d921fb561104823223bc 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -18,7 +18,6 @@ PERL=         perl
 RM=            rm -f
 # KRB5 stuff
 KRB5_INCLUDES=
-LIBKRB5=
 
 PEX_LIBS=
 EX_LIBS= 
@@ -99,17 +98,20 @@ install:
        @for i in $(EXE); \
        do  \
        (echo installing $$i; \
-        cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-        chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$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;
        @for i in $(SCRIPTS); \
        do  \
        (echo installing $$i; \
-        cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
-        chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
+        cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+        chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \
+        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/misc/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/misc/$$i ); \
         done
-       @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
-       chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
+       @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+       chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
+       mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 
 tags:
        ctags $(SRC)
@@ -148,7 +150,9 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
        fi
        -(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \
                LIBPATH="`pwd`"; LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; \
-               export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH; \
+               if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
+               elif [ "$(PLATFORM)" != "Cygwin" ];  then PATH="`pwd`:$$PATH"; fi; \
+               export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
                $(PERL) tools/c_rehash certs)
 
 progs.h: progs.pl