Adjust some default installation directories

- on VMS, SYS$COMMON:[SSL] is already used as installation directory
  by HP SSL, so we make our default for --openssldir
  SYS$COMMON:[OPENSSL-COMMON] instead.
- Updated notes on default installation dirs fir Unix and Windows

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-23 23:04:32 +01:00
parent 828d04afe4
commit 667c6bfe18
2 changed files with 8 additions and 7 deletions

View file

@ -119,11 +119,12 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; }
DESTDIR=
# Do not edit this manually. Use Configure --prefix=DIR to change this!
INSTALLTOP={- catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-\$(MAJOR).\$(MINOR)]" -}
INSTALLTOP={- (my $x = $config{version}) =~ s|\.|_|g;
catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-$x]" -}
# This is the standard central area to store certificates, private keys...
OPENSSLDIR={- catdir($config{openssldir}) ||
$config{prefix} ? catdir($config{prefix},"SSL")
: "SYS\$COMMON:[SSL]" -}
$config{prefix} ? catdir($config{prefix},"COMMON")
: "SYS\$COMMON:[OPENSSL-COMMON]" -}
# Where installed engines reside
ENGINESDIR={- $osslprefix -}ENGINES:

View file

@ -55,8 +55,8 @@
Unix: normal installation directories under /usr/local
OpenVMS: SYS$COMMON:[OPENSSL-'version'...], where 'version' is the
OpenSSL version number ('major'_'minor').
Windows: currently don't have an install function <TBA>
OpenSSL version number with underscores instead of periods.
Windows: C:\Program Files\OpenSSL or C:\Program Files (x86)\OpenSSL
If you want to install it anywhere else, run config like this:
@ -87,10 +87,10 @@
--openssldir=DIR Directory for OpenSSL configuration files, and also the
default certificate and key store. Defaults are:
Unix: PREFIX/ssl (PREFIX is given by --prefix)
Unix: /usr/local/ssl
Windows: C:\Program Files\Common Files\SSL
or C:\Program Files (x86)\Common Files\SSL
OpenVMS: SYS$COMMON:[SSL]
OpenVMS: SYS$COMMON:[OPENSSL-COMMON]
--api=x.y.z Don't build with support for deprecated APIs below the
specified version number. For example "--api=1.1.0" will