Commit 623e9e66 authored by Bodo Möller's avatar Bodo Möller
Browse files

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

needed, call 'pod2man' directly if this works

PR: 217
parent 90f5a2b6

Makefile.org

+3 −3
Original line number Diff line number Diff line
@@ -743,13 +743,13 @@ install_docs: 
		$(INSTALL_PREFIX)$(MANDIR)/man3 \

		$(INSTALL_PREFIX)$(MANDIR)/man5 \

		$(INSTALL_PREFIX)$(MANDIR)/man7

	@pod2man=`cd util; ./pod2mantest ignore`; \

	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \

	for i in doc/apps/*.pod; do \

		fn=`basename $$i .pod`; \

		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "$(PERL) $$pod2man \

		sh -c "$$pod2man \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

			>  $(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; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "$(PERL) $$pod2man \

		sh -c "$$pod2man \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \

util/pod2mantest

+13 −9
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ 


IFS=:

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.

for dir in dummy${IFS}$PATH; do

    if [ "$try_without_dir" = true ]; then
@@ -30,10 +31,17 @@ for dir in dummy${IFS}$PATH; do 
    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 "$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

	    fi

	fi





        if [ "$failure" = none ]; then
@@ -46,9 +54,5 @@ for dir in dummy${IFS}$PATH; do 
done



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 "../../util/pod2man.pl"

  exit 0

fi

exit 1
 
echo "$1 ../../util/pod2man.pl"