branch-1_4 - provide a man page

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch means that maintainers need to have a recent version of
help2man installed.  It turns 'm4 --help' into a man page, and includes
that in the distribution.  I took care to ensure that in a distribution,
m4.1 has the right timestamp so that ordinary users going straight from a
tarball need not rebuild m4.1.

2006-06-07  Eric Blake  <address@hidden>

        Distribute a rudimentary man page.
        * Makefile.am (SUBDIRS): Move doc after src so that 'm4 --help'
        can feed help2man.
        * doc/Makefile.am (man_MANS, EXTRA_DIST, MAINTAINERDISTCLEAN),
        (SUFFIXES, m4.1): New macros and rules to build m4.1.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEhsKc84KuGfSFAYARAnMWAJ9CaEejHf/k6zwmcduE2m5xqqaIagCgltek
hl+9nDMoSm5yAQ8mApZ75w8=
=BUH+
-----END PGP SIGNATURE-----

Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.25.2.1
diff -u -p -r1.25.2.1 Makefile.am
--- Makefile.am 29 May 2006 19:40:03 -0000      1.25.2.1
+++ Makefile.am 7 Jun 2006 12:06:54 -0000
@@ -20,6 +20,6 @@
 ##
 ## Written by Gary V. Vaughan <address@hidden>
 
-SUBDIRS = doc examples lib src checks
+SUBDIRS = examples lib src doc checks
 EXTRA_DIST = bootstrap c-boxes.el Makefile.maint
 DISTCLEANFILES = stamp-h
Index: doc/Makefile.am
===================================================================
RCS file: /sources/m4/m4/doc/Attic/Makefile.am,v
retrieving revision 1.8.2.1
diff -u -p -r1.8.2.1 Makefile.am
--- doc/Makefile.am     29 May 2006 19:40:03 -0000      1.8.2.1
+++ doc/Makefile.am     7 Jun 2006 12:06:54 -0000
@@ -20,3 +20,16 @@
 ## This file written by Eric Blake <address@hidden>
 
 info_TEXINFOS = m4.texinfo
+man_MANS = m4.1
+EXTRA_DIST = $(man_MANS)
+MAINTAINERDISTCLEAN = $(man_MANS)
+SUFFIXES = .1
+
+# Depend on configure.ac for version, m4.c for usage text.  Do not depend on
+# built m4 executable, since not everyone has help2man or perl.
+m4.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/m4.c
+       @if test -x ../src/m4$(EXEEXT) ; then \
+         echo "Updating man page m4.1" ; \
+         $(SHELL) $(top_srcdir)/missing --run \
+           help2man -o m4.1 ../src/m4$(EXEEXT) ; \
+       fi