generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change how pod2man is handled: explicitly invoke '$PERL' only when

Browse Source 
needed, call 'pod2man' directly if this works

PR: 217
This commit is contained in:
Bodo Möller
2002-08-14 14:04:24 +00:00
parent 90f5a2b6fe
commit 623e9e66c0
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.org
View File

@@ -743,13 +743,13 @@ 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 ignore`; \ @pod2man="`cd util; ./pod2mantest $(PERL)`"; \
for i in doc/apps/*.pod; do \ for i in doc/apps/*.pod; do \
fn=`basename $$i .pod`; \ fn=`basename $$i .pod`; \
if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
(cd `$(PERL) util/dirname.pl $$i`; \ (cd `$(PERL) util/dirname.pl $$i`; \
sh -c "$(PERL) $$pod2man \ sh -c "$$pod2man \
--section=$$sec --center=OpenSSL \ --section=$$sec --center=OpenSSL \
--release=$(VERSION) `basename $$i`") \ --release=$(VERSION) `basename $$i`") \
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
@@ -759,7 +759,7 @@ install_docs:
if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
(cd `$(PERL) util/dirname.pl $$i`; \ (cd `$(PERL) util/dirname.pl $$i`; \
sh -c "$(PERL) $$pod2man \ sh -c "$$pod2man \
--section=$$sec --center=OpenSSL \ --section=$$sec --center=OpenSSL \
--release=$(VERSION) `basename $$i`") \ --release=$(VERSION) `basename $$i`") \
> $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \

18
util/pod2mantest
View File

@@ -12,7 +12,8 @@
IFS=: IFS=:
if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
try_without_dir=false
try_without_dir=true
# First we try "pod2man", then "$dir/pod2man" for each item in $PATH. # First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
for dir in dummy${IFS}$PATH; do for dir in dummy${IFS}$PATH; do
if [ "$try_without_dir" = true ]; then if [ "$try_without_dir" = true ]; then
@@ -30,10 +31,17 @@ for dir in dummy${IFS}$PATH; do
if [ ! "$pod2man" = '' ]; then if [ ! "$pod2man" = '' ]; then
failure=none failure=none
if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | fgrep OpenSSL >/dev/null; then
:
else
failure=BasicTest
fi
if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | grep '^MARKER - ' >/dev/null 2>&1; then if [ "$failure" = none ]; then
if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | grep '^MARKER - ' >/dev/null; then
failure=MultilineTest failure=MultilineTest
fi fi
fi
if [ "$failure" = none ]; then if [ "$failure" = none ]; then
@@ -46,9 +54,5 @@ for dir in dummy${IFS}$PATH; do
done done
echo "No working pod2man found. Consider installing a new version." >&2 echo "No working pod2man found. Consider installing a new version." >&2
if [ "$1" = ignore ]; then
echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2 echo "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
echo "../../util/pod2man.pl" echo "$1 ../../util/pod2man.pl"
exit 0
fi
exit 1