x-to-1: honor $PERL

* build-aux/x-to-1.in: Run $HELP2MAN via $PERL so that the user gets
a chance to use his preferred version of Perl.  This is typically
required by Darwin users whose default /usr/bin/perl does not have all
the libraries required by help2man, and who need to use their MacPorts
installation of Perl instead.

diff --git a/ChangeLog b/ChangeLog
index 5fa567d..e95e443 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-16  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+       x-to-1: honor $PERL
+       * build-aux/x-to-1.in: Run $HELP2MAN via $PERL so that the user gets
+       a chance to use his preferred version of Perl.  This is typically
+       required by Darwin users whose default /usr/bin/perl does not have all
+       the libraries required by help2man, and who need to use their MacPorts
+       installation of Perl instead.
+
 2012-12-16  Akim Demaille  <akim@lrde.epita.fr>
 
        gnu-web-doc-update: add all the new files, even in new directories

diff --git a/build-aux/x-to-1.in b/build-aux/x-to-1.in
index 3c598e8..d5cb868 100644 (file)
--- a/build-aux/x-to-1.in
+++ b/build-aux/x-to-1.in
@@ -44,9 +44,9 @@ progname=`basename $aux .x`
 case "$PERL" in *"/missing perl") perlok=no;; *) perlok=yes;; esac
 if test @CROSS_COMPILING@ = no && test -f $executable && test $perlok = yes; then
   echo "Updating man page $output"
-  echo "$HELP2MAN --include=$aux $executable > $output"
+  echo "$PERL $HELP2MAN --include=$aux $executable > $output"
   rm -f t-$progname.1
-  $HELP2MAN --include=$aux $executable > t-$progname.1 || exit 1
+  $PERL $HELP2MAN --include=$aux $executable > t-$progname.1 || exit 1
   if test -n "$update"; then
     # In --update mode, don't overwrite the output if nothing would change.
     if cmp t-$progname.1 $output >/dev/null 2>&1; then