branch-1_4 gendocs

[Eric Blake]

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

Now that gnulib provides gendocs.sh, it is easier to use it from there
rather than fetching from texinfo.  I added the files to the distribution,
although they are only ever used by Makefile.maint.  I'm closer to making
the 1.4.5 release - I'm slowly making my final pass through the manual for
grammatical and formatting errors.  Perhaps this weekend.

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

        * Makefile.maint (fetch): Get gendocs from gnulib, not texinfo.
        (web-manual): Simplify.
        * m4/gnulib-cache.m4: Augment with gnulib-tool --import gendocs.
        * Makefile.am (EXTRA_DIST): Distribute gendocs.sh.
        (MAINTAINERCLEANFILES): Clean it as well.
        * doc/Makefile.am (EXTRA_DIST): Distribute gendocs_template.
        (MAINTAINERCLEANFILES): Clean it as well.

- --
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

iD8DBQFEtkFc84KuGfSFAYARAgd2AJ0Q2Nv49VJY2eAQH6UMAUFMYRxqqACfaWpS
lfROkcvtoIbLRuymRJWcW/M=
=Qdq6
-----END PGP SIGNATURE-----

Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.25.2.8
diff -u -p -r1.25.2.8 Makefile.am
--- Makefile.am 11 Jul 2006 14:17:40 -0000      1.25.2.8
+++ Makefile.am 13 Jul 2006 12:47:39 -0000
@@ -21,14 +21,14 @@
 ## Written by Gary V. Vaughan <address@hidden>
 
 SUBDIRS = . examples lib src doc checks
-EXTRA_DIST = bootstrap c-boxes.el GNUmakefile Makefile.maint \
+EXTRA_DIST = bootstrap c-boxes.el gendocs.sh GNUmakefile Makefile.maint \
        m4/gnulib-cache.m4
 DISTCLEANFILES = stamp-h
 ## maintainer-clean should remove as much as possible that ./bootstrap can
 ## recreate.  In the m4 directory, keep only gnulib-cache.m4.
 MAINTAINERCLEANFILES = COPYING INSTALL Makefile.in aclocal.m4 \
-       config-h.in configure depcomp doc/fdl.texi install-sh lib/* \
-       m4/[a-fh-z]* m4/g[a-mo-z]* m4/gnulib-comp.m4 m4/gnulib-tool.m4 \
+       config-h.in configure depcomp doc/fdl.texi gendocs.sh install-sh
+       lib/* m4/[a-fh-z]* m4/g[a-mo-z]* m4/gnulib-comp.m4 m4/gnulib-tool.m4 \
        missing stamp-h.in
 
 ACLOCAL_AMFLAGS = -I m4
Index: Makefile.maint
===================================================================
RCS file: /sources/m4/m4/Attic/Makefile.maint,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 Makefile.maint
--- Makefile.maint      2 Jul 2006 01:34:24 -0000       1.1.2.5
+++ Makefile.maint      13 Jul 2006 12:47:39 -0000
@@ -93,9 +93,7 @@ fetch:
        (cd Fetchdir && \
        $(WGETSGO)/autoconf/autoconf/INSTALL; \
        $(WGETSGO)/automake/automake/lib/install-sh; \
-       $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex; \
-       $(WGETSGO)/texinfo/texinfo/util/gendocs.sh; \
-       $(WGETSGO)/texinfo/texinfo/util/gendocs_template; )
+       $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex; )
 ## Don't exit after test because we want to give as many errors as
 ## possible.
        @stat=0; for file in $(FETCHFILES); do \
@@ -198,12 +196,7 @@ delta-xdelta: prev-tarball new-tarball g
 
 .PHONY: web-manual
 web-manual:
-       @ln -s `cd $(srcdir) && pwd`/doc/$(PACKAGE).texinfo doc/$(PACKAGE).texi
-       @ln -s `cd $(srcdir) && pwd`/doc/version.texi doc/version.texi
-       @ln -s `pwd`/Fetchdir/gendocs.sh doc/gendocs.sh
-       @ln -s `pwd`/Fetchdir/gendocs_template doc/gendocs_template
-       @cd doc; \
-         $(SHELL) ./gendocs.sh $(PACKAGE) "GNU $(PACKAGE) - GNU macro 
processor"
-       @rm -rf doc/$(PACKAGE).texi doc/version.texi doc/gendocs* manual
-       @mv -f doc/manual .
-       @echo " *** Upload the manual directory to web-cvs."
+       @cd ./doc; \
+         $(SHELL) "$(abs_srcdir)/gendocs.sh" $(PACKAGE) \
+           "GNU $(PACKAGE)- GNU macro processor"
+       @echo " *** Upload the doc/manual directory to web-cvs."
Index: doc/Makefile.am
===================================================================
RCS file: /sources/m4/m4/doc/Attic/Makefile.am,v
retrieving revision 1.8.2.6
diff -u -p -r1.8.2.6 Makefile.am
--- doc/Makefile.am     11 Jul 2006 14:17:40 -0000      1.8.2.6
+++ doc/Makefile.am     13 Jul 2006 12:47:39 -0000
@@ -22,8 +22,8 @@
 info_TEXINFOS = m4.texinfo
 m4_TEXINFOS = fdl.texi
 man_MANS = m4.1
-EXTRA_DIST = $(man_MANS)
-MAINTAINERCLEANFILES = $(man_MANS)
+EXTRA_DIST = $(man_MANS) gendocs_template
+MAINTAINERCLEANFILES = $(man_MANS) gendocs_template
 SUFFIXES = .1
 
 # Depend on configure.ac for version, m4.c for usage text.  Do not depend on
Index: m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/m4/Attic/gnulib-cache.m4,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 gnulib-cache.m4
--- m4/gnulib-cache.m4  11 Jul 2006 14:17:40 -0000      1.1.2.5
+++ m4/gnulib-cache.m4  13 Jul 2006 12:47:39 -0000
@@ -15,14 +15,14 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 
--doc-base=doc --aux-dir=. --macro-prefix=M4 alloca binary-io error fdl getopt 
mkstemp obstack regex strtol xalloc xvasprintf
+#   gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 
--doc-base=doc --aux-dir=. --macro-prefix=M4 alloca binary-io error fdl gendocs 
getopt mkstemp obstack regex strtol xalloc xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([alloca binary-io error fdl getopt mkstemp obstack regex strtol 
xalloc xvasprintf])
+gl_MODULES([alloca binary-io error fdl gendocs getopt mkstemp obstack regex 
strtol xalloc xvasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
-gl_TESTS_BASE([tests])
 gl_DOC_BASE([doc])
+gl_TESTS_BASE([tests])
 gl_LIB([libm4])
 gl_MACRO_PREFIX([M4])