diff options
| author | Matt Caswell <matt@openssl.org> | 2021-04-12 18:04:43 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-04-19 01:31:35 +0200 |
| commit | ae6f65ae08262d4c32575ad94e491d9fb59f00ff (patch) | |
| tree | 6b351ea501829a73dd05a59dcbf08a1174d6f20d | |
| parent | Add DHX FIPS 186-4 domain parameter validation example (diff) | |
| download | openssl-ae6f65ae08262d4c32575ad94e491d9fb59f00ff.tar.xz openssl-ae6f65ae08262d4c32575ad94e491d9fb59f00ff.zip | |
Change the default MANSUFFIX
We now use the MANSUFFIX "ossl" by default.
Fixes #14318
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14847)
| -rw-r--r-- | CHANGES.md | 4 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index 76ba709c0e..9b4a122e6c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,6 +23,10 @@ OpenSSL 3.0 ### Changes between 1.1.1 and 3.0 [xx XXX xxxx] + * The default manual page suffix ($MANSUFFIX) has been changed to "ossl" + + *Matt Caswell* + * Added support for Kernel TLS (KTLS). In order to use KTLS, support for it must be compiled in using the "enable-ktls" compile time option. It must also be enabled at run time using the SSL_OP_ENABLE_KTLS option. diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index c04271c468..64c5faff18 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -288,7 +288,7 @@ HTMLDIR=$(DOCDIR)/html # MANSUFFIX is for the benefit of anyone who may want to have a suffix # appended after the manpage file section number. "ssl" is popular, # resulting in files such as config.5ssl rather than config.5. -MANSUFFIX= +MANSUFFIX=ossl HTMLSUFFIX=html # For "optional" echo messages, to get "real" silence @@ -1356,7 +1356,7 @@ EOF my $pod = $gen0; return <<"EOF"; $args{src}: $pod - pod2man --name=$name --section=$section --center=OpenSSL \\ + pod2man --name=$name --section=$section\$(MANSUFFIX) --center=OpenSSL \\ --release=\$(VERSION) $pod >\$\@ EOF } elsif (platform->isdef($args{src})) { |