Various IA-64 assembler fix-ups.

[openssl.git] / tools / Makefile.ssl

diff --git a/tools/Makefile.ssl b/tools/Makefile.ssl
index 86749f51110519f92009217da51e639617af94f8..cb33d4a41eee0a2225888c252c2005b34f5b6453 100644 (file)
--- a/tools/Makefile.ssl
+++ b/tools/Makefile.ssl
@@ -5,7 +5,7 @@
 DIR=   tools
 TOP=   ..
 CC=    cc
 DIR=   tools
 TOP=   ..
 CC=    cc

-INCLUDES= -I.. -I../../include
+INCLUDES= -I$(TOP) -I../../include

 CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl


@@ -27,20 +27,22 @@ all:
 install:
        @for i in $(APPS) ; \
        do  \
 install:
        @for i in $(APPS) ; \
        do  \

-       (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 $(MISC_APPS) ; \
        do  \
        done;
        @for i in $(MISC_APPS) ; \
        do  \

-       (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)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \

        done;
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
        done;
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:

-       @$(TOP)/util/point.sh Makefile.ssl Makefile
+       @sh $(TOP)/util/point.sh Makefile.ssl Makefile

 
 lint:
 
 
 lint: