help2man

[Akim Demaille]

Help2man is shipped with Texinfo.  This is no longer the common
approach, help2man is considered a simple maintainer dependency, just
as Autoconf, Automake etc.  One problem that fixes this approach is
that help2man has no longer /usr/local/bin/perl hard coded into it,
which breaks on machines such as mine where perl is in /usr/bin.

So I suggest the following, which is what we do in Autoconf.

NB: - Don't forget to cvs rm doc/help2man.
    - Many white spaces in ChangeLog!

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * configure.ac (HELP2MAN): Look for it.
        * doc/help2man: Remove.
        * doc/Makefile.am (HELP2MAN, noinst_SCRIPT): Remove.
        (common_mandeps): Don't depend on HELP2MAN which can be a complex
        command such as "missing --run help2man.

Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.35
diff -u -u -r1.35 configure.ac
--- configure.ac 13 Nov 2003 23:03:23 -0000 1.35
+++ configure.ac 24 Nov 2003 08:22:14 -0000
@@ -27,6 +27,7 @@
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+AM_MISSING_PROG(HELP2MAN, help2man)
 
 AC_ISC_POSIX
 AC_MINIX
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile.am
--- doc/Makefile.am 8 Nov 2003 21:18:06 -0000 1.14
+++ doc/Makefile.am 24 Nov 2003 08:22:14 -0000
@@ -16,8 +16,6 @@
 
 man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
            info.5 texinfo.5
-HELP2MAN = $(srcdir)/help2man
-noinst_SCRIPTS = $(HELP2MAN)
 
 # Use the programs built in our distribution.
 MAKEINFO = ../makeinfo/makeinfo
@@ -58,7 +56,7 @@
 
 # The man pages depend on the --help strings and the version number.
 if MAINTAINER_MODE
-common_mandeps = $(top_srcdir)/configure.ac $(HELP2MAN)
+common_mandeps = $(top_srcdir)/configure.ac
 info.1: $(top_srcdir)/info/info.c $(common_mandeps)
        $(HELP2MAN) --name="read Info documents" `basename $< .c` >$@
 infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
Index: doc/version-stnd.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version-stnd.texi,v
retrieving revision 1.3
diff -u -u -r1.3 version-stnd.texi
--- doc/version-stnd.texi 8 Nov 2003 00:05:50 -0000 1.3
+++ doc/version-stnd.texi 24 Nov 2003 08:22:14 -0000
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 November 2003
address@hidden UPDATED 6 November 2003
 @set UPDATED-MONTH November 2003
 @set EDITION 4.6
 @set VERSION 4.6
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.7
diff -u -u -r1.7 version.texi
--- doc/version.texi 23 Nov 2003 00:35:38 -0000 1.7
+++ doc/version.texi 24 Nov 2003 08:22:14 -0000
@@ -1,4 +1,4 @@
address@hidden UPDATED 22 November 2003
address@hidden UPDATED 24 November 2003
 @set UPDATED-MONTH November 2003
 @set EDITION 4.6
 @set VERSION 4.6