Correct a couple of command errors.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 0f370d2ea558186a640ca0601f8c50e747ee9ddd..61f9302f3b75a5d4be273eac6c38c358dffaf316 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -156,6 +156,7 @@ SDIRS=  \
 MAKEFILE= Makefile.ssl
 MAKE=     make -f Makefile.ssl
 
+MANDIR=$(OPENSSLDIR)/man
 MAN1=1
 MAN3=3
 SHELL=/bin/sh
@@ -216,7 +217,7 @@ libclean:
        rm -f *.a */lib */*/lib
 
 clean:
-       rm -f shlib/*.o *.o core a.out fluff *.map
+       rm -f shlib/*.o *.o core a.out fluff *.map rehash.time
        @for i in $(DIRS) ;\
        do \
        (cd $$i && echo "making clean in $$i..." && \
@@ -259,8 +260,10 @@ dclean:
        $(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' dclean ) || exit 1; \
        done;
 
-rehash:
+rehash: rehash.time
+rehash.time: certs
        @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
+       touch rehash.time
 
 test:   tests
 
@@ -269,6 +272,9 @@ tests: rehash
        $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
        @apps/openssl version -a
 
+report:
+       @$(PERL) util/selftest.pl
+
 depend:
        @for i in $(DIRS) ;\
        do \
@@ -326,17 +332,14 @@ dist:
 dist_pem_h:
        (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
 
-install: all
+install: all install_docs
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
                $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
                $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/private \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/lib \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man1 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man3 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man5
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/lib
        @for i in $(EXHEADER) ;\
        do \
        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -354,9 +357,30 @@ install: all
                $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
                chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
        done
-       @echo installing man 1
-       @for i in doc/apps/*.pod; do (cd `dirname $$i`; fn=`basename $$i .pod`; sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; ../../util/pod2man.pl --section=$$sec --date=`date +%Y-%m-%d` --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done
-       @echo installing man 3
-       @for i in doc/crypto/*.pod doc/ssl/*.pod; do (cd `dirname $$i`; ../../util/pod2man.pl --section=3 --date=`date +%Y-%m-%d` --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man3/`basename $$i .pod`.3); done
+
+install_docs:
+       @$(PERL) $(TOP)/util/mkdir-p.pl \
+               $(INSTALL_PREFIX)$(MANDIR)/man1 \
+               $(INSTALL_PREFIX)$(MANDIR)/man3 \
+               $(INSTALL_PREFIX)$(MANDIR)/man5 \
+               $(INSTALL_PREFIX)$(MANDIR)/man7
+       @echo installing man 1 and man 5
+       @for i in doc/apps/*.pod; do \
+               (cd `dirname $$i`; \
+               fn=`basename $$i .pod`; \
+               sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
+               $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+                        --release=$(VERSION) `basename $$i` \
+                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
+       done
+       @echo installing man 3 and man 7
+       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+               (cd `dirname $$i`; \
+               fn=`basename $$i .pod`; \
+               sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
+               $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+                       --release=$(VERSION) `basename $$i` \
+                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
+       done
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.