summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-13 17:55:48 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-13 18:32:01 +0100
commitdde10ab4d25fd5f6d1b4342d66459f981495f17b (patch)
tree9660a8d00c76545db13e4f9fca61f0c710482368 /Configurations
parentb3214008e42eba8e8d05b52f22b50570927962c7 (diff)
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>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl10
1 files changed, 7 insertions, 3 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 4049846a37..84b3630c53 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -82,8 +82,8 @@ LIBDIR={- #
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
@@ -157,7 +157,7 @@ list-tests:
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
@@ -196,6 +196,10 @@ install_docs: install_man_docs install_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"