consistency cosmetics

[openssl.git] / apps / Makefile.ssl

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index dbc6db0fde6cf9b6fc2f6cb83d3f09e77d601005..124879c500953f599ea3af6c6a7c105779ffad4a 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -7,7 +7,9 @@ TOP=            ..
 CC=            cc
 INCLUDES=      -I../include
 CFLAG=         -g -static
+INSTALL_PREFIX=
 INSTALLTOP=    /usr/local/ssl
+OPENSSLDIR=    /usr/local/ssl
 MAKE=          make -f Makefile.ssl
 MAKEDEPEND=    $(TOP)/util/domd $(TOP)
 MAKEFILE=      Makefile.ssl
@@ -87,14 +89,20 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 install:
-       @for i in $(EXE) $(SCRIPTS); \
+       @for i in $(EXE); \
        do  \
        (echo installing $$i; \
-        cp $$i $(INSTALLTOP)/bin/$$i; \
-        chmod 755 $(INSTALLTOP)/bin/$$i ); \
-        done; \
-       cp openssl.cnf $(INSTALLTOP)/lib; \
-       chmod 644 $(INSTALLTOP)/lib/openssl.cnf
+        cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+        chmod 755 $(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 ); \
+        done
+       @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/lib; \
+       chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/lib/openssl.cnf
 
 tags:
        ctags $(SRC)
@@ -108,7 +116,7 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-       $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
+       $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
@@ -639,7 +647,8 @@ version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 version.o: ../include/openssl/opensslv.h ../include/openssl/rc2.h
 version.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
 version.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-version.o: ../include/openssl/sha.h ../include/openssl/stack.h apps.h progs.h
+version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+version.o: ../include/openssl/stack.h apps.h progs.h
 x509.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 x509.o: ../include/openssl/buffer.h ../include/openssl/cast.h