Generate web docs for 2.62.

* doc/autoconf.texi (Evaluation Macros): Fix typo.
(Notices): Use recommended means to escape RCS keyword.
* cfg.mk (gnulib_dir): New macro.
(web-manual): New target.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 3f6a5c01926829113979119d6b245f65465b3f13..8c06f67a38b0f52d1d9c1905a5fea0467d938c60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-08  Eric Blake  <ebb9@byu.net>
+
+       Generate web docs for 2.62.
+       * doc/autoconf.texi (Evaluation Macros): Fix typo.
+       (Notices): Use recommended means to escape RCS keyword.
+       * cfg.mk (gnulib_dir): New macro.
+       (web-manual): New target.
+
 2008-04-05  Eric Blake  <ebb9@byu.net>
 
        Release Version 2.62.

diff --git a/cfg.mk b/cfg.mk
index 3869ff49d96e846e55aa54a9ecf62969e32d09f4..773c335b74f5802d80200fdbf52acae6fb418c23 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -64,3 +64,15 @@ executable-update: wget-update cvs-update autom4te-update
 # Tests not to run.
 local-checks-to-skip ?= \
   changelog-check sc_unmarked_diagnostics
+
+# The local directory containing the checked-out copy of gnulib used in this
+# release.  For now, used solely for generating the web-manual.
+gnulib_dir = '$(abs_srcdir)'/../gnulib
+
+.PHONY: web-manual
+web-manual:
+       @cd $(srcdir)/doc ; \
+       GENDOCS_TEMPLATE_DIR=$(gnulib_dir)/doc; export GENDOCS_TEMPLATE_DIR; \
+       $(SHELL) $(gnulib_dir)/build-aux/gendocs.sh autoconf \
+           "$(PACKAGE_NAME) - Creating Automatic Configuration Scripts"
+       @echo " *** Upload the doc/manual directory to web-cvs."

diff --git a/doc/.gitignore b/doc/.gitignore
index 0a1e04a368eb95a7a69635a2b82ff029b6bdd6b5..c806b1e039dc13635c188748d47f5b12d818a1a6 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -14,7 +14,7 @@
 *.fns
 *.html
 *.htp
-*.info
+*.info*
 *.ky
 *.log
 *.MS
@@ -32,6 +32,7 @@
 *.vr
 *.vrs
 Makefile
+manual
 stamp-vti
 standards
 version.texi

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index c22b822372e435f506793a699714eb4e518dbbb6..49ade0f0bddd9310bfe58c54ac4057297b8a1422 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1872,9 +1872,9 @@ without @acronym{RCS} or @acronym{CVS} changing it when you check in
 
 For example, this line in @file{configure.ac}:
 
-@c The asis prevents RCS from changing the example in the manual.
+@c The @w prevents RCS from changing the example in the manual.
 @example
-AC_REVISION([$@asis{Revision: 1.30 }$])
+AC_REVISION([@w{$}Revision: 1.30 $])
 @end example
 
 @noindent
@@ -10814,7 +10814,7 @@ The following macros give some control over the order of the evaluation
 by adding or removing levels of quotes.
 
 @defmac m4_apply (@var{macro}, @var{list})
-@msindex apply
+@msindex{apply}
 Apply the elements of the quoted, comma-separated @var{list} as the
 arguments to @var{macro}.  If @var{list} is empty, invoke @var{macro}
 without arguments.  Note the difference between @code{m4_indir}, which