wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Have the same installation directories in unified as in unixmake

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

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-13 17:55:48 +01:00
parent b3214008e4
commit dde10ab4d2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Configurations/unix-Makefile.tmpl
View file

@ -82,8 +82,8 @@ LIBDIR={- #
ENGINESDIR={- use File::Spec::Functions; ENGINESDIR={- use File::Spec::Functions;
catdir($prefix,$libdir,"engines") -} catdir($prefix,$libdir,"engines") -}
MANDIR=$(OPENSSLDIR)/man MANDIR=$(INSTALLTOP)/share/man
HTMLDIR=$(OPENSSLDIR)/html HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html
MANSUFFIX=ssl MANSUFFIX=ssl
HTMLSUFFIX=html HTMLSUFFIX=html
@ -157,7 +157,7 @@ list-tests:
libclean: libclean:
-rm -f `find $(BLDDIR) -name '*$(LIB_EXT)' -o -name '*$(SHLIB_EXT)'` -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: install_dev:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@echo "*** Installing development files" @echo "*** Installing development files"