From 56a0d956d196be7828d0845aa225a0514c395e37 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 11 Jun 2010 22:12:16 +0100
Subject: [PATCH] * Makefile.in (install-local): Include
 $(srcdir)/docs/man/$$dest.h2m when generating manual pages. *
 docs/man/grub-bin2h.h2m: New file. * docs/man/grub-editenv.h2m: New file. *
 docs/man/grub-fstest.h2m: New file. * docs/man/grub-install.h2m: New file. *
 docs/man/grub-macho2img.h2m: New file. * docs/man/grub-mkconfig.h2m: New
 file. * docs/man/grub-mkdevicemap.h2m: New file. * docs/man/grub-mkfont.h2m:
 New file. * docs/man/grub-mkimage.h2m: New file. *
 docs/man/grub-mkpasswd-pbkdf2.h2m: New file. * docs/man/grub-mkrelpath.h2m:
 New file. * docs/man/grub-mkrescue.h2m: New file. *
 docs/man/grub-ofpathname.h2m: New file. * docs/man/grub-pe2elf.h2m: New file.
 * docs/man/grub-probe.h2m: New file. * docs/man/grub-reboot.h2m: New file. *
 docs/man/grub-script-check.h2m: New file. * docs/man/grub-set-default.h2m:
 New file. * docs/man/grub-setup.h2m: New file.

---
 ChangeLog                         | 24 ++++++++++++++++++++++++
 Makefile.in                       |  8 ++++----
 docs/man/grub-bin2h.h2m           |  2 ++
 docs/man/grub-editenv.h2m         |  2 ++
 docs/man/grub-fstest.h2m          |  2 ++
 docs/man/grub-install.h2m         |  2 ++
 docs/man/grub-macho2img.h2m       |  2 ++
 docs/man/grub-mkconfig.h2m        |  2 ++
 docs/man/grub-mkdevicemap.h2m     |  2 ++
 docs/man/grub-mkfont.h2m          |  2 ++
 docs/man/grub-mkimage.h2m         |  2 ++
 docs/man/grub-mkpasswd-pbkdf2.h2m |  2 ++
 docs/man/grub-mkrelpath.h2m       |  2 ++
 docs/man/grub-mkrescue.h2m        |  2 ++
 docs/man/grub-ofpathname.h2m      |  2 ++
 docs/man/grub-pe2elf.h2m          |  2 ++
 docs/man/grub-probe.h2m           |  2 ++
 docs/man/grub-reboot.h2m          |  2 ++
 docs/man/grub-script-check.h2m    |  2 ++
 docs/man/grub-set-default.h2m     |  2 ++
 docs/man/grub-setup.h2m           |  2 ++
 21 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 docs/man/grub-bin2h.h2m
 create mode 100644 docs/man/grub-editenv.h2m
 create mode 100644 docs/man/grub-fstest.h2m
 create mode 100644 docs/man/grub-install.h2m
 create mode 100644 docs/man/grub-macho2img.h2m
 create mode 100644 docs/man/grub-mkconfig.h2m
 create mode 100644 docs/man/grub-mkdevicemap.h2m
 create mode 100644 docs/man/grub-mkfont.h2m
 create mode 100644 docs/man/grub-mkimage.h2m
 create mode 100644 docs/man/grub-mkpasswd-pbkdf2.h2m
 create mode 100644 docs/man/grub-mkrelpath.h2m
 create mode 100644 docs/man/grub-mkrescue.h2m
 create mode 100644 docs/man/grub-ofpathname.h2m
 create mode 100644 docs/man/grub-pe2elf.h2m
 create mode 100644 docs/man/grub-probe.h2m
 create mode 100644 docs/man/grub-reboot.h2m
 create mode 100644 docs/man/grub-script-check.h2m
 create mode 100644 docs/man/grub-set-default.h2m
 create mode 100644 docs/man/grub-setup.h2m

diff --git a/ChangeLog b/ChangeLog
index c4a6246ee..43cf36b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2010-06-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in (install-local): Include $(srcdir)/docs/man/$$dest.h2m
+	when generating manual pages.
+	* docs/man/grub-bin2h.h2m: New file.
+	* docs/man/grub-editenv.h2m: New file.
+	* docs/man/grub-fstest.h2m: New file.
+	* docs/man/grub-install.h2m: New file.
+	* docs/man/grub-macho2img.h2m: New file.
+	* docs/man/grub-mkconfig.h2m: New file.
+	* docs/man/grub-mkdevicemap.h2m: New file.
+	* docs/man/grub-mkfont.h2m: New file.
+	* docs/man/grub-mkimage.h2m: New file.
+	* docs/man/grub-mkpasswd-pbkdf2.h2m: New file.
+	* docs/man/grub-mkrelpath.h2m: New file.
+	* docs/man/grub-mkrescue.h2m: New file.
+	* docs/man/grub-ofpathname.h2m: New file.
+	* docs/man/grub-pe2elf.h2m: New file.
+	* docs/man/grub-probe.h2m: New file.
+	* docs/man/grub-reboot.h2m: New file.
+	* docs/man/grub-script-check.h2m: New file.
+	* docs/man/grub-set-default.h2m: New file.
+	* docs/man/grub-setup.h2m: New file.
+
 2010-06-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use FOR_* macros instead of *_iterate whenever possible.
diff --git a/Makefile.in b/Makefile.in
index 75388e3c8..afe4beb6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,26 +323,26 @@ install-local: all
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
 	@list='$(sbin_UTILITIES)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
 	done
 	@list='$(bin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
 	done
 	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
 	@list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \
diff --git a/docs/man/grub-bin2h.h2m b/docs/man/grub-bin2h.h2m
new file mode 100644
index 000000000..ef463f3d1
--- /dev/null
+++ b/docs/man/grub-bin2h.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-bin2h \- convert a binary file to a C header
diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
new file mode 100644
index 000000000..efbd79070
--- /dev/null
+++ b/docs/man/grub-editenv.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-editenv \- edit GRUB environment block
diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
new file mode 100644
index 000000000..be39429b5
--- /dev/null
+++ b/docs/man/grub-fstest.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-fstest \- debug tool for GRUB filesystem drivers
diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
new file mode 100644
index 000000000..65252155c
--- /dev/null
+++ b/docs/man/grub-install.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-install \- install GRUB to a device
diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
new file mode 100644
index 000000000..412bf926a
--- /dev/null
+++ b/docs/man/grub-macho2img.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-macho2img \- convert Mach-O to raw image
diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
new file mode 100644
index 000000000..b0d33ec61
--- /dev/null
+++ b/docs/man/grub-mkconfig.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkconfig \- generate a GRUB configuration file
diff --git a/docs/man/grub-mkdevicemap.h2m b/docs/man/grub-mkdevicemap.h2m
new file mode 100644
index 000000000..8ab34ac86
--- /dev/null
+++ b/docs/man/grub-mkdevicemap.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkdevicemap \- generate a GRUB device map file automatically
diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
new file mode 100644
index 000000000..d8580186f
--- /dev/null
+++ b/docs/man/grub-mkfont.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkfont \- make GRUB font files
diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
new file mode 100644
index 000000000..71f270940
--- /dev/null
+++ b/docs/man/grub-mkimage.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkimage \- make a bootable image of GRUB
diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
new file mode 100644
index 000000000..5b2b2ef7f
--- /dev/null
+++ b/docs/man/grub-mkpasswd-pbkdf2.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB
diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
new file mode 100644
index 000000000..ccc0880fa
--- /dev/null
+++ b/docs/man/grub-mkrelpath.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkrelpath \- make a system path relative to its root
diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
new file mode 100644
index 000000000..5e92e0d99
--- /dev/null
+++ b/docs/man/grub-mkrescue.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkrescue \- make a GRUB rescue image
diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
new file mode 100644
index 000000000..f07158cb3
--- /dev/null
+++ b/docs/man/grub-ofpathname.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-ofpathname \- find OpenBOOT path for a device
diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
new file mode 100644
index 000000000..3fdb88b43
--- /dev/null
+++ b/docs/man/grub-pe2elf.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-pe2elf \- convert PE image to ELF
diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
new file mode 100644
index 000000000..817ba8ef6
--- /dev/null
+++ b/docs/man/grub-probe.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-probe \- probe device information for GRUB
diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
new file mode 100644
index 000000000..957e4b797
--- /dev/null
+++ b/docs/man/grub-reboot.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-reboot \- set the default boot entry for GRUB, for the next boot only
diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
new file mode 100644
index 000000000..39c0a3ef6
--- /dev/null
+++ b/docs/man/grub-script-check.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-script-check \- check grub.cfg for syntax errors
diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
new file mode 100644
index 000000000..3ac13d7ed
--- /dev/null
+++ b/docs/man/grub-set-default.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-set-default \- set the default boot entry for GRUB
diff --git a/docs/man/grub-setup.h2m b/docs/man/grub-setup.h2m
new file mode 100644
index 000000000..e70e465a4
--- /dev/null
+++ b/docs/man/grub-setup.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-setup \- set up a device to boot using GRUB