diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-01-15 20:53:29 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-02-26 17:26:39 +0100 |
| commit | 1ec45faba59660f3c0ce8ea0c19fb3a63b12b069 (patch) | |
| tree | 6e1114d6a3cc8e6ac1065c3e018ab06950fbb318 /Configurations | |
| parent | apps x509: restrict CAkeyform option to OPT_FMT_PDE (diff) | |
| download | openssl-1ec45faba59660f3c0ce8ea0c19fb3a63b12b069.tar.xz openssl-1ec45faba59660f3c0ce8ea0c19fb3a63b12b069.zip | |
Use a wrapper for pod2html
Remove unused util/process_docs.pl
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/10856)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 7 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 8 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 5 |
3 files changed, 5 insertions, 15 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 15fefd2502..5b2936dea0 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -770,13 +770,10 @@ reconfigure reconf : if ($args{src} =~ /\.html$/) { my $title = basename($args{src}, ".html"); my $pod = $args{generator}->[0]; + my $mkpod2html = sourcefile('util', 'mkpod2html.pl'); return <<"EOF"; $args{src}: $pod - pipe pod2html "--podroot=\$(SRCDIR)/doc" --htmldir=.. - - --podpath=man1:man3:man5:man7 "--infile=$pod" - - "--title=$title" - - | \$(PERL) -pe "s|href=""http://man\\.he\\.net/(man\d/[^""]+)(?:\\.html)?""|href=""../\$1.html|g;" - - > \$\@ + \$(PERL) $mkpod2html -i $pod -o \$\@ -t "$title" -r "\$(SRCDIR)/doc" EOF } elsif (platform->isdef($args{src})) { my $target = platform->def($args{src}); diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 55c1b12573..51ba10f62a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1187,10 +1187,7 @@ reconfigure reconf: my $pod = $args{generator}->[0]; return <<"EOF"; $args{src}: $pod - pod2html "--podroot=\$(SRCDIR)/doc" --htmldir=.. \\ - --podpath=man1:man3:man5:man7 --infile=$pod "--title=$title" \\ - | \$(PERL) -pe 's|href="http://man\\.he\\.net/(man\\d/[^"]+)(?:\\.html)?"|href="../\$1.html|g;' \\ - > \$\@ + \$(PERL) \$(SRCDIR)/util/mkpod2html.pl -i "$pod" -o \$\@ -t "$title" -r "\$(SRCDIR)/doc" EOF } elsif ($args{src} =~ /\.(\d)$/) { my $section = $1; @@ -1199,8 +1196,7 @@ EOF return <<"EOF"; $args{src}: $pod pod2man --name=$name --section=$section --center=OpenSSL \\ - --release=\$(VERSION) $pod \\ - > \$\@ + --release=\$(VERSION) $pod >\$\@ EOF } elsif (platform->isdef($args{src})) { my $target = platform->def($args{src}); diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 074e8f74c5..afc386daec 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -587,10 +587,7 @@ reconfigure reconf: my $pod = $args{generator}->[0]; return <<"EOF"; $args{src}: "$pod" - pod2html "--podroot=\$(SRCDIR)/doc" --htmldir=.. \\ - --podpath=man1:man3:man5:man7 "--infile=$pod" "--title=$title" \\ - | \$(PERL) -pe ^"s^|href=\\^"http://man\\.he\\.net/^(man\\d/[^^\\^"]+^)^(?:\.html^)?^"^|href=\\^"../\$\$1.html^|g;^" \\ - > \$\@ + \$(PERL) \$(SRCDIR)/util/mkpod2html.pl -i "$pod" -o \$\@ -t "$title" -r "\$(SRCDIR)/doc" EOF } elsif (platform->isdef($args{src})) { my $target = platform->def($args{src}); |