[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  588d2375a29bd128ff91b9bd2b7bf659a5f48c1a (commit)
      from  b4eee58a5f9dfa493d6cc34b4af871415c67beda (commit)


- Log -----------------------------------------------------------------
commit 588d2375a29bd128ff91b9bd2b7bf659a5f48c1a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 10 22:03:28 2016 +0100

    Small fixups of util/process_docs.pl
    
    - the pod path hadn't been changed with the directory layout change
    - apparently, pod2html doesn't add ".html" at the end of links, making
      them useless, so we need to fix that
    
    With thanks for the report to Michel <michel.sales at free.fr>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1896)

-----------------------------------------------------------------------

Summary of changes:
 util/process_docs.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/process_docs.pl b/util/process_docs.pl
index 2c54f02..e1d479d 100644
--- a/util/process_docs.pl
+++ b/util/process_docs.pl
@@ -90,7 +90,7 @@ foreach my $section (sort @{$options{section}}) {
         my $suffix = { man  => ".$podinfo{section}",
                        html => ".html" } -> {$options{type}};
         my $generate = { man  => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"",
-                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=apps:crypto:ssl \"--infile=$podpath\" \"--title=$podname\""
+                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\""
                          } -> {$options{type}};
         my $output_dir = catdir($options{destdir}, "man$podinfo{section}");
         my $output_file = $podname . $suffix;
@@ -102,7 +102,7 @@ foreach my $section (sort @{$options{section}}) {
                 if $options{debug};
             unless ($options{"dry-run"}) {
                 @output = `$generate`;
-                map { s|href="http://man\.he\.net/man|href="../man|g; } @output
+                map { s|href="http://man\.he\.net/(man\d/[^"]+)(?:\.html)?"|href="../$1.html|g; } @output
                     if $options{type} eq "html";
             }
             print STDERR "DEBUG: Done processing\n" if $options{debug};