diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-01-20 18:11:51 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-22 00:52:31 +0100 |
| commit | d74dfafd8bfb98e77ba07c4827362836e4160e94 (patch) | |
| tree | 660bf9979109d15b468700c2d4f66fc03e6d1d39 /Makefile.in | |
| parent | dd67493c344d9d98413d2ee7fd2b6fa9411d975c (diff) | |
Refresh the thinking of --prefix and --openssldir
--prefix is now exclusively used for software and manual installation.
--openssldir is not exclusively used as a default location for certs,
keys and the default openssl.cnf.
This change is made to bring clarity, to have the two less
intertwined, and to be more compatible with the usual ways of software
installation.
Please change your habits and scripts to use --prefix rather than
--openssldir for installation location now.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 6c74a704a3..47ce7c0b8b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,10 +24,11 @@ HERE=. # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. # Normally it is left empty. INSTALL_PREFIX= -INSTALLTOP=/usr/local/ssl -# Do not edit this manually. Use Configure --openssldir=DIR to change this! -OPENSSLDIR=/usr/local/ssl +# Do not edit these manually. Use Configure with --prefix or --openssldir +# to change this! Short explanation in the top comment in Configure +INSTALLTOP=/usr/local +OPENSSLDIR=$(INSTALLTOP)/ssl # NO_IDEA - Define to build without the IDEA algorithm # NO_RC4 - Define to build without the RC4 algorithm @@ -153,12 +154,12 @@ TESTS = alltests MAKEFILE= Makefile -MANDIR=$(OPENSSLDIR)/man +MANDIR=$(INSTALLTOP)/share/man MAN1=1 MAN3=3 MANSUFFIX= HTMLSUFFIX=html -HTMLDIR=$(OPENSSLDIR)/html +HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html SHELL=/bin/sh TOP= . |