2010-01-01 Robert Millan <rmh.grub@aybabtu.com>

	* autogen.sh: Use `gnulib-tool' to install gendocs.sh.
	* Makefile.am (web-manual): New target.  Builds a web manual using
	gendocs.sh.
	* configure.ac (AC_PREREQ): Require Autoconf 2.59 or later.

diff --git a/.bzrignore b/.bzrignore
index 65e15905583812ba5d706c23e9594ddb3505cbd2..fda4598169df3192f0dc2891afc4114447f49988 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,6 @@
+gendocs.sh
+lib
+m4
 .deps
 Makefile
 autom4te.cache
@@ -10,6 +13,8 @@ stamp-h1
 doc/Makefile
 doc/*.info*
 doc/.deps
+doc/gendocs_template
+doc/mdate-sh
 doc/Makefile.in
 doc/boot.S.texi
 doc/kernel

diff --git a/ChangeLog b/ChangeLog
index 99a63c232b90615feb5900bbd57c3abcbee51311..d345c2a878d9e8b2d27a042946017071b327575f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-01  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * autogen.sh: Use `gnulib-tool' to install gendocs.sh.
+       * Makefile.am (web-manual): New target.  Builds a web manual using
+       gendocs.sh.
+       * configure.ac (AC_PREREQ): Require Autoconf 2.59 or later.
+
 2010-01-01  Robert Millan  <rmh.grub@aybabtu.com>
 
        Use more standard `doc' directory.

diff --git a/Makefile.am b/Makefile.am
index 036e05bea5c8b0cb538cc52ee2cf4476accceb93..82af03204eaecc29cda9e7e98c4b9e089f72faf5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,11 @@
 # Do not change this order if you don't know what you are doing.
 AUTOMAKE_OPTIONS = 1.7 gnu
 SUBDIRS = doc
+
+.PHONY: web-manual
+web-manual:
+       @cd '$(srcdir)/doc' ; \
+               $(SHELL) ../gendocs.sh -o '$(abs_builddir)/doc/manual' \
+               --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
+               "$(PACKAGE_NAME) - $(manual_title)"
+       @echo " *** Upload the doc/manual directory to web-cvs."

diff --git a/autogen.sh b/autogen.sh
index 0c3d05093c4fb2c94f857bff13beb681654effb4..92843a367eb3d9653d5272ab9ade550046512414 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,7 @@
 
 set -ex
 
+gnulib-tool --import gendocs
 aclocal
 autoheader
 

diff --git a/configure.ac b/configure.ac
index 706cb57f7617fb89bfaba3ffc169173060f0e6f7..bf1511eba1b86e79df54c413dfaf6aadf0e37516 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ dnl "AS IS" CONDITION.  THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY
 dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
 dnl USE OF THIS SOFTWARE.
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.59)
 AC_INIT([Multiboot], [0.6.96], [bug-grub@gnu.org])
 AC_CONFIG_SRCDIR([doc/multiboot.texi])
 AC_CONFIG_HEADER([config.h])