Remove old private pod2man
Include Richard's point to remove the 'sh -c' wrapper Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
parent
5b17b79a89
commit
a4a934119d
@ -716,7 +716,6 @@ install_docs:
|
|||||||
$(INSTALL_PREFIX)$(MANDIR)/man3 \
|
$(INSTALL_PREFIX)$(MANDIR)/man3 \
|
||||||
$(INSTALL_PREFIX)$(MANDIR)/man5 \
|
$(INSTALL_PREFIX)$(MANDIR)/man5 \
|
||||||
$(INSTALL_PREFIX)$(MANDIR)/man7
|
$(INSTALL_PREFIX)$(MANDIR)/man7
|
||||||
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
|
|
||||||
here="`pwd`"; \
|
here="`pwd`"; \
|
||||||
filecase=; \
|
filecase=; \
|
||||||
case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
|
case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
|
||||||
@ -727,9 +726,9 @@ install_docs:
|
|||||||
sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
|
sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
|
||||||
echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
|
echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
|
||||||
(cd `$(PERL) util/dirname.pl $$i`; \
|
(cd `$(PERL) util/dirname.pl $$i`; \
|
||||||
sh -c "$$pod2man \
|
pod2man \
|
||||||
--section=$$sec --center=OpenSSL \
|
--section=$$sec --center=OpenSSL \
|
||||||
--release=$(VERSION) `basename $$i`") \
|
--release=$(VERSION) `basename $$i`) \
|
||||||
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
|
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
|
||||||
$(PERL) util/extract-names.pl < $$i | \
|
$(PERL) util/extract-names.pl < $$i | \
|
||||||
(grep -v $$filecase "^$$fn\$$"; true) | \
|
(grep -v $$filecase "^$$fn\$$"; true) | \
|
||||||
@ -744,9 +743,9 @@ install_docs:
|
|||||||
sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
|
sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
|
||||||
echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
|
echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
|
||||||
(cd `$(PERL) util/dirname.pl $$i`; \
|
(cd `$(PERL) util/dirname.pl $$i`; \
|
||||||
sh -c "$$pod2man \
|
pod2man \
|
||||||
--section=$$sec --center=OpenSSL \
|
--section=$$sec --center=OpenSSL \
|
||||||
--release=$(VERSION) `basename $$i`") \
|
--release=$(VERSION) `basename $$i`) \
|
||||||
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
|
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
|
||||||
$(PERL) util/extract-names.pl < $$i | \
|
$(PERL) util/extract-names.pl < $$i | \
|
||||||
(grep -v $$filecase "^$$fn\$$"; true) | \
|
(grep -v $$filecase "^$$fn\$$"; true) | \
|
||||||
|
1184
util/pod2man.pl
1184
util/pod2man.pl
File diff suppressed because it is too large
Load Diff
@ -1,58 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# This script is used by test/Makefile to check whether a sane 'pod2man'
|
|
||||||
# is installed.
|
|
||||||
# ('make install' should not try to run 'pod2man' if it does not exist or if
|
|
||||||
# it is a broken 'pod2man' version that is known to cause trouble. if we find
|
|
||||||
# the system 'pod2man' to be broken, we use our own copy instead)
|
|
||||||
#
|
|
||||||
# In any case, output an appropriate command line for running (or not
|
|
||||||
# running) pod2man.
|
|
||||||
|
|
||||||
|
|
||||||
IFS=:
|
|
||||||
if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
|
|
||||||
|
|
||||||
try_without_dir=true
|
|
||||||
# First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
|
|
||||||
for dir in dummy${IFS}$PATH; do
|
|
||||||
if [ "$try_without_dir" = true ]; then
|
|
||||||
# first iteration
|
|
||||||
pod2man=pod2man
|
|
||||||
try_without_dir=false
|
|
||||||
else
|
|
||||||
# second and later iterations
|
|
||||||
pod2man="$dir/pod2man"
|
|
||||||
if [ ! -f "$pod2man" ]; then # '-x' is not available on Ultrix
|
|
||||||
pod2man=''
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! "$pod2man" = '' ]; then
|
|
||||||
failure=none
|
|
||||||
|
|
||||||
if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | fgrep OpenSSL >/dev/null; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
failure=BasicTest
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$failure" = none ]; then
|
|
||||||
if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | grep '^MARKER - ' >/dev/null; then
|
|
||||||
failure=MultilineTest
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if [ "$failure" = none ]; then
|
|
||||||
echo "$pod2man"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$pod2man does not work properly ('$failure' failed). Looking for another pod2man ..." >&2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "No working pod2man found. Consider installing a new version." >&2
|
|
||||||
echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
|
|
||||||
echo "$1 ../../util/pod2man.pl"
|
|
@ -1,15 +0,0 @@
|
|||||||
=pod
|
|
||||||
|
|
||||||
=head1 NAME
|
|
||||||
|
|
||||||
foo, bar,
|
|
||||||
MARKER - test of multiline name section
|
|
||||||
|
|
||||||
=head1 DESCRIPTION
|
|
||||||
|
|
||||||
This is a test .pod file to see if we have a buggy pod2man or not.
|
|
||||||
If we have a buggy implementation, we will get a line matching the
|
|
||||||
regular expression "^ +MARKER - test of multiline name section *$"
|
|
||||||
at the end of the resulting document.
|
|
||||||
|
|
||||||
=cut
|
|
Loading…
x
Reference in New Issue
Block a user