2009-09-21 Colin Watson <cjwatson@ubuntu.com>

	Build info documentation.  Some code borrowed from Automake.

	* configure.ac: Check for makeinfo.
	* Makefile.in (MAKEINFO, INFOS, info_INFOS): New variables.
	(MAINTAINER_CLEANFILES): Add $(INFOS), docs/stamp-vti, and
	docs/version.texi.
	(MOSTLYCLEANFILES): Add vti.tmp.
	(docs/version.texi, docs/stamp-vti): Update automatically.
	(docs/grub.info): Build info documentation.  Use --force and ignore
	errors for now.
	(all-local): Add $(INFOS).
	(install-local): Install info files.
	(uninstall): Uninstall info files.
	* docs/version.texi: Remove from revision control.  This file is
	automatically generated on build now.
	* gendistlist.sh: Add `*.info'.

diff --git a/ChangeLog b/ChangeLog
index 5f50e08318931953ed8f0ee3cbbe95f51b2c93c6..22aeb6feb3b850de5595596013545ee949f793d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-09-21  Colin Watson  <cjwatson@ubuntu.com>
+
+       Build info documentation.  Some code borrowed from Automake.
+
+       * configure.ac: Check for makeinfo.
+       * Makefile.in (MAKEINFO, INFOS, info_INFOS): New variables.
+       (MAINTAINER_CLEANFILES): Add $(INFOS), docs/stamp-vti, and
+       docs/version.texi.
+       (MOSTLYCLEANFILES): Add vti.tmp.
+       (docs/version.texi, docs/stamp-vti): Update automatically.
+       (docs/grub.info): Build info documentation.  Use --force and ignore
+       errors for now.
+       (all-local): Add $(INFOS).
+       (install-local): Install info files.
+       (uninstall): Uninstall info files.
+       * docs/version.texi: Remove from revision control.  This file is
+       automatically generated on build now.
+       * gendistlist.sh: Add `*.info'.
+
 2009-09-21  Felix Zielcke  <fzielcke@z-51.de>
 
        * kern/term.c: Fix indentation.

diff --git a/Makefile.in b/Makefile.in
index ff84afb7b21db5392a705b4e8203bc87758b2ed8..ee4589a789c2bfab7b4b69bfcc73b851f7d4fd1b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,10 @@ OBJCOPY = @OBJCOPY@
 STRIP = @STRIP@
 NM = @NM@
 RUBY = @RUBY@
+MAKEINFO = @MAKEINFO@
+ifeq (, $(MAKEINFO))
+MAKEINFO = true
+endif
 HELP2MAN = @HELP2MAN@
 ifeq (, $(HELP2MAN))
 HELP2MAN = true
@@ -122,6 +126,7 @@ PKGDATA = $(pkgdata_DATA)
 PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
 SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) \
        $(lib_SCRIPTS)
+INFOS = $(info_INFOS)
 
 CLEANFILES =
 MOSTLYCLEANFILES =
@@ -129,7 +134,7 @@ DISTCLEANFILES = config.status config.cache config.log config.h \
        Makefile stamp-h include/grub/cpu include/grub/machine \
        gensymlist.sh genkernsyms.sh build_env.mk
 MAINTAINER_CLEANFILES = $(srcdir)/configure $(addprefix $(srcdir)/,$(MKFILES)) \
-       $(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in
+       $(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
 
 # The default target.
 all: all-local
@@ -168,6 +173,27 @@ handler.lst: $(HANDLERFILES)
 parttool.lst: $(PARTTOOLFILES)
        cat $^ /dev/null | sort | uniq > $@
 
+info_INFOS += docs/grub.info
+
+MOSTLYCLEANFILES += vti.tmp
+MAINTAINER_CLEANFILES += docs/stamp-vti docs/version.texi
+docs/version.texi: docs/stamp-vti
+docs/stamp-vti: docs/grub.texi
+       (set `$(SHELL) $(srcdir)/docs/mdate-sh $<`; \
+       echo "@set UPDATED $$1 $$2 $$3"; \
+       echo "@set UPDATED-MONTH $$2 $$3"; \
+       echo "@set EDITION $(PACKAGE_VERSION)"; \
+       echo "@set VERSION $(PACKAGE_VERSION)") > vti.tmp
+       @cmp -s vti.tmp $(srcdir)/docs/version.texi \
+         || (echo "Updating $(srcdir)/docs/version.texi"; \
+             cp vti.tmp $(srcdir)/docs/version.texi)
+       -@rm -f vti.tmp
+       @cp $(srcdir)/docs/version.texi $@
+
+# Use --force until such time as the documentation is cleaned up.
+docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
+       $(MAKEINFO) --no-split --force $< -o $@ || :
+
 ifeq (, $(UNIFONT_BDF))
 else
 
@@ -207,7 +233,7 @@ pkglib_BUILDDIR += config.h grub_script.tab.h
 include_DATA += $(shell find $(srcdir)/include -name \*.h | sed -e "s,^$(srcdir)/,,g") \
        include/grub/cpu include/grub/machine
 
-all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES)
+all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES)
 
 install: install-local
 
@@ -285,6 +311,17 @@ install-local: all
          dest="`echo $$file | sed 's,.*/,,'`"; \
          $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
        done
+       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
+       @list='$(info_INFOS)'; \
+       for file in $$list; do \
+         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
+         dest="`echo $$file | sed 's,.*/,,'`"; \
+         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(infodir); \
+         if (install-info --version && \
+              install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$dest" || :; \
+         fi; \
+       done
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install
@@ -325,6 +362,19 @@ uninstall:
          echo rm -f $(DESTDIR)$(libdir)/$$dest; \
          rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
        done
+       @list='$(info_INFOS)'; \
+       for file in $$list; do \
+         dest="`echo $$file | sed 's,.*/,,'`"; \
+         if (install-info --version && \
+              install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+           if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$dest"; then \
+             :; \
+           else \
+             test ! -f "$(DESTDIR)$(infodir)/$$dest" || exit 1; \
+           fi; \
+         fi; \
+         rm -f $(DESTDIR)$(infodir)/$$dest; \
+       done
 
 clean: $(CLEAN_IMAGE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_UTILITY_TARGETS)
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

diff --git a/configure.ac b/configure.ac
index 59e8510d3a127c240599b372859fcb0e1ef2bc47..e827a32c297c2fed76e5c1148b4a73466f564fa7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,7 @@ AC_PROG_MAKE_SET
 
 # These are not a "must".
 AC_PATH_PROG(RUBY, ruby)
+AC_PATH_PROG(MAKEINFO, makeinfo)
 
 #
 # Checks for host programs.

diff --git a/docs/version.texi b/docs/version.texi
deleted file mode 100644 (file)
index 65ec130..0000000
--- a/docs/version.texi
+++ /dev/null
@@ -1,4 +0,0 @@
-@set UPDATED 7 Ago 2009
-@set UPDATED-MONTH Ago 2009
-@set EDITION 1.97~beta3
-@set VERSION 1.97~beta3

diff --git a/gendistlist.sh b/gendistlist.sh
index 3278ed0b3905d3ac381e0a65fa2526927bbd1556..7f6c32a447f63214935d8a21b555c592b383f7b5 100644 (file)
--- a/gendistlist.sh
+++ b/gendistlist.sh
@@ -38,7 +38,8 @@ for dir in $DISTDIRS; do
   for d in `find $dir -type d | sed '/\/\.svn$/d;\/\.svn\//d' | sort`; do
     find $d -maxdepth 1 -name '*.[chSy]' -o -name '*.mk' -o -name '*.rmk' \
       -o -name '*.rb' -o -name '*.in' -o -name '*.tex' -o -name '*.texi' \
-      -o -name 'grub.cfg' -o -name 'README' -o -name '*.sc' -o -name 'mdate-sh' \
-      -o -name '*.sh' -o -name 'grub-dumpdevtree' -o -name '*.lua' | sort
+      -o -name '*.info' -o -name 'grub.cfg' -o -name 'README' \
+      -o -name '*.sc' -o -name 'mdate-sh' -o -name '*.sh' \
+      -o -name 'grub-dumpdevtree' -o -name '*.lua' | sort
   done
 done