Fix ct_test to not assume it's in the source directory

[openssl.git] / apps / Makefile.in

diff --git a/apps/Makefile.in b/apps/Makefile.in
index e3f485d901384a8811b4202fbc1f9b9b932abcc0..6e8bdf5882ecf401c35aba85380a411ef490729f 100644 (file)
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -15,6 +15,8 @@ PLIB_LDFLAG=
 EX_LIBS= 
 EXE_EXT= 
 
+APPS_OBJ=
+
 SHLIB_TARGET=
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -28,6 +30,7 @@ LIBSSL=-L.. -lssl
 
 SCRIPTS=CA.pl tsget
 EXE= openssl$(EXE_EXT)
+CONFS=openssl.cnf ct_log_list.cnf
 
 COMMANDS= \
        asn1pars.o ca.o ciphers.o cms.o crl.o crl2p7.o dgst.o dhparam.o \
@@ -52,7 +55,7 @@ SRC   = \
        s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \
        srp.c ts.c verify.c version.c x509.c rehash.c
 
-EXE_OBJ        = openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ)
+EXE_OBJ        = openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ) $(APPS_OBJ)
 EXE_SRC = openssl.c $(SRC) $(EXTRA_SRC) $(RAND_SRC)
 
 HEADER=        apps.h progs.h s_apps.h \
@@ -78,40 +81,48 @@ files:
 install:
        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
        @set -e; for i in $(EXE); \
-       do  \
-       (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;
+       do \
+               echo installing $$i; \
+               cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
+               chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
+               mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
+       done
        @set -e; for i in $(SCRIPTS); \
-       do  \
-       (echo installing $$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
-       @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
+       do \
+               echo installing $$i; \
+               cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
+               chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
+               mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
+       done
+       @set -e; for i in $(CONFS); \
+       do \
+               echo installing $$i; \
+               cp $$i $(DESTDIR)$(OPENSSLDIR)/$$i.new; \
+               chmod 644 $(DESTDIR)$(OPENSSLDIR)/$$i.new; \
+               mv -f $(DESTDIR)$(OPENSSLDIR)/$$i.new $(DESTDIR)$(OPENSSLDIR)/$$i; \
+       done
 
 uninstall:
        @set -e; for i in $(EXE); \
-       do  \
-               echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-               $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-       done;
+       do \
+               echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
+               $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
+       done
        @set -e; for i in $(SCRIPTS); \
-       do  \
-               echo $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
-               $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
+       do \
+               echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
+               $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
+       done
+       @set -e; for i in $(CONFS); \
+       do \
+               echo $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \
+               $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \
        done
-       $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 
 generate: openssl-vms.cnf progs.h
 
 depend:
-       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(EXE_SRC)
 
 clean:
        rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)