Commit 588d2375 authored by Richard Levitte's avatar Richard Levitte
Browse files

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@free.fr>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1896)
parent b4eee58a

util/process_docs.pl

+2 −2
Original line number Diff line number Diff line
@@ -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};