From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 1 Jan 2010 20:13:23 +0000 (+0000)
Subject: 2010-01-01  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a997d75fd04aaec1c892fccbbb4f42b9dea334cc;p=thirdparty%2Fgrub.git

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 65e159055..fda459816 100644
--- 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 99a63c232..d345c2a87 100644
--- 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 036e05bea..82af03204 100644
--- 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 0c3d05093..92843a367 100755
--- 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 706cb57f7..bf1511eba 100644
--- 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])