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

needed, call 'pod2man' directly if this works

PR: 217

diff --git a/Makefile.org b/Makefile.org
index 56e11a144b721f7182698b08984894c687d2b6d3..6b5af10f7e63ee7614ec51f51ad9418fc3b5f6e3 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -687,13 +687,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; \
@@ -703,7 +703,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; \

diff --git a/util/pod2mantest b/util/pod2mantest
index 449ef14f1b438426ccf82f3a2d46f0243c08689d..026a6a1789d253046fe7b8a0294fd15118ae59bc 100755 (executable)
--- a/util/pod2mantest
+++ b/util/pod2mantest
@@ -11,7 +11,8 @@
 
 
 IFS=:
-try_without_dir=false
+
+try_without_dir=true
 # First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
 for dir in dummy:$PATH; do
     if [ "$try_without_dir" = true ]; then
@@ -29,9 +30,16 @@ for dir in dummy:$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
-           failure=MultilineTest
+       if [ "$failure" = none ]; then
+           if "$pod2man" --section=1 --center=OpenSSL --release=dev pod2mantest.pod | grep '^MARKER - ' >/dev/null; then
+               failure=MultilineTest
+           fi
        fi
 
 
@@ -45,9 +53,5 @@ for dir in dummy:$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 "As a workaround, we'll use a bundled old copy of pod2man.pl." >&2
+echo "$1 ../../util/pod2man.pl"