From: Debian OpenSSL Team Date: Sun, 5 Nov 2017 15:09:09 +0100 Subject: man-section --- Configurations/unix-Makefile.tmpl | 6 ++++-- util/process_docs.pl | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 1292053546f5..c034d21884d8 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -183,7 +183,8 @@ 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=ssl +MANSECTION=SSL HTMLSUFFIX=html # For "optional" echo messages, to get "real" silence @@ -726,7 +727,8 @@ uninstall_runtime: uninstall_programs uninstall_runtime_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(ECHO) "*** Installing manpages" $(PERL) $(SRCDIR)/util/process_docs.pl \ - --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) + --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) \ + --mansection=$(MANSECTION) uninstall_man_docs: @$(ECHO) "*** Uninstalling manpages" diff --git a/util/process_docs.pl b/util/process_docs.pl index 30b149eb8fcc..424155ea808e 100755 --- a/util/process_docs.pl +++ b/util/process_docs.pl @@ -37,6 +37,7 @@ GetOptions(\%options, 'type=s', # The result type, 'man' or 'html' 'suffix:s', # Suffix to add to the extension. # Only used with type=man + 'mansection:s', # Section to put to manpage in 'remove', # To remove files rather than writing them 'dry-run|n', # Only output file names on STDOUT 'debug|D+', @@ -97,7 +98,7 @@ foreach my $section (sort @{$options{section}}) { my $name = uc $podname; my $suffix = { man => ".$podinfo{section}".($options{suffix} // ""), html => ".html" } -> {$options{type}}; - my $generate = { man => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"", + my $generate = { man => "pod2man --name=$name --section=$podinfo{section}$options{mansection} --center=OpenSSL --release=$config{version} \"$podpath\"", html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet" } -> {$options{type}}; my $output_dir = catdir($options{destdir}, "man$podinfo{section}");