Fix for PKCS12_create if no-rc2 specified.

[openssl.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index c0770b3cbcd2205348002b6e96732d062aa0c9af..bb6fb71f3eb8a78173040442643383c09a51ac9b 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,5 @@
 #
-# SSLeay/tools/Makefile
+# OpenSSL/tools/Makefile
 #
 
 DIR=   tools
@@ -7,12 +7,6 @@ TOP=   ..
 CC=    cc
 INCLUDES= -I$(TOP) -I../../include
 CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKE=          make
-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=      Makefile
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -25,6 +19,7 @@ MISC_APPS= c_hash c_info c_issuer c_name
 all:
 
 install:
+       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
        @for i in $(APPS) ; \
        do  \
        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
@@ -54,6 +49,7 @@ depend:
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
        mv -f Makefile.new $(MAKEFILE)
+       rm -f c_rehash
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff