Make Configure add the configuration options that it was copmiled

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 257f6a5b6605306209a12ab33fedfeeecadb97bb..55213dd1256480851549fcce63e983fc3257a53d 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
@@ -262,7 +263,7 @@ dclean:
 rehash: rehash.time
 rehash.time: certs
        @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
-       touch .rehash.time
+       touch rehash.time
 
 test:   tests
 
@@ -356,13 +357,27 @@ install: all install_docs
 
 install_docs:
        @$(PERL) $(TOP)/util/mkdir-p.pl \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man1 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man3 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man5 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man7
+               $(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`; ../../util/pod2man.pl --section=$$sec --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done
+       @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`; ../../util/pod2man.pl --section=$$sec --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done
+       @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.