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)

diff --git a/CHANGES.md b/CHANGES.md
index 76ba709c0e9b5992d62dc0d18a4c0e5573a4eb75..9b4a122e6cdb6b1303f367d1322d3b413a313b3d 100644 (file)
--- 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 c04271c4686668920fec17c574862f75e69dd2bf..64c5faff18ac90e2898d9638ae077057674df323 100644 (file)
--- 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})) {