Have the same installation directories in unified as in unixmake

unix-Makefile.tmpl was lagging behind on this point.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 4049846a3723bcb5f480fa04082abc5747711d91..84b3630c537ba58bbfce3086c8a97010ba91b727 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -82,8 +82,8 @@ LIBDIR={- #
 ENGINESDIR={- use File::Spec::Functions;
               catdir($prefix,$libdir,"engines") -}
 
 ENGINESDIR={- use File::Spec::Functions;
               catdir($prefix,$libdir,"engines") -}
 

-MANDIR=$(OPENSSLDIR)/man
-HTMLDIR=$(OPENSSLDIR)/html
+MANDIR=$(INSTALLTOP)/share/man
+HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html

 
 MANSUFFIX=ssl
 HTMLSUFFIX=html
 
 MANSUFFIX=ssl
 HTMLSUFFIX=html


@@ -157,7 +157,7 @@ list-tests:
 libclean:
        -rm -f `find $(BLDDIR) -name '*$(LIB_EXT)' -o -name '*$(SHLIB_EXT)'`
 
 libclean:
        -rm -f `find $(BLDDIR) -name '*$(LIB_EXT)' -o -name '*$(SHLIB_EXT)'`
 

-install: install_sw install_docs
+install: install_sw install_ssldirs install_docs

 
 uninstall: uninstall_docs uninstall_sw
 
 
 uninstall: uninstall_docs uninstall_sw
 


@@ -196,6 +196,10 @@ install_docs: install_man_docs install_html_docs
 
 uninstall_docs: uninstall_man_docs uninstall_html_docs
 
 
 uninstall_docs: uninstall_man_docs uninstall_html_docs
 

+install_ssldirs:
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/private
+

 install_dev:
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @echo "*** Installing development files"
 install_dev:
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @echo "*** Installing development files"