Allow creating the HTML documentation with texi2html or makeinfo.

3 files changed, 34 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 42b21d7..93c8cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-09-08  Bruno Haible  <bruno@clisp.org>
+
+	Allow creating the HTML documentation with texi2html or makeinfo.
+	* doc/texi2html: New file, from GNU gettext.
+	* doc/Makefile.in (TEXI2HTML): Invoke it.
+	(gperf.html, gperf_toc.html): Don't pass option -expandinfo.
+	* doc/gperf.texi (makeinfo): New variable.
+	(dircategory, direntry): Enclose in @ifinfo.
+	(Table of Contents): Move to the beginning except in TeX mode.
+
 2007-04-30  Brendan Kehoe  <brendan@zen.org>
 
 	* gperf-3.0.3 released.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e68bc63..f717242 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -51,7 +51,7 @@ TEXI2DVI = texi2dvi
 DVIPS = dvips -D600
 TEXI2PDF = texi2pdf
 MAKEINFO = LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo
-TEXI2HTML = texi2html
+TEXI2HTML = perl $(srcdir)/texi2html
 
 # Programs used by "make install":
 INSTALL = @INSTALL@
@@ -99,11 +99,11 @@ $(srcdir)/gperf.pdf : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
 html : gperf.html gperf_toc.html
 
 gperf.html : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
-	cd $(srcdir) && $(TEXI2HTML) -expandinfo -number -monolithic gperf.texi
+	cd $(srcdir) && $(TEXI2HTML) -number -monolithic gperf.texi
 
 gperf_toc.html : $(srcdir)/gperf.texi $(srcdir)/gpl.texinfo
 	cd $(srcdir) && $(RM) gperf_*.html
-	cd $(srcdir) && $(TEXI2HTML) -expandinfo -number -split_chapter gperf.texi
+	cd $(srcdir) && $(TEXI2HTML) -number -split_chapter gperf.texi
 
 
 install : all force
diff --git a/doc/gperf.texi b/doc/gperf.texi
index e23f7b5..146a004 100644
--- a/doc/gperf.texi
+++ b/doc/gperf.texi
@@ -1,6 +1,13 @@
 \input texinfo @c -*- texinfo -*-
 @c %**start of header
 @setfilename gperf.info
+@c The @ifset makeinfo ... @end ifset conditional evaluates to true in makeinfo
+@c for info and html output, but to false in texi2html.
+@ifnottex
+@ifclear texi2html
+@set makeinfo
+@end ifclear
+@end ifnottex
 @settitle Perfect Hash Function Generator
 @c @setchapternewpage odd
 @c %**end of header
@@ -19,16 +26,18 @@
 @syncodeindex fn cp
 @c @synindex pg cp
 
+@ifinfo
 @dircategory Programming Tools
 @direntry
 * Gperf: (gperf).                Perfect Hash Function Generator.
 @end direntry
+@end ifinfo
 
 @ifinfo
 This file documents the features of the GNU Perfect Hash Function
 Generator @value{VERSION}.
 
-Copyright @copyright{} 1989-2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1989-2007 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -87,7 +96,12 @@ included in a translation approved by the author instead of in the
 original English.
 @end titlepage
 
-@ifinfo
+@ifnottex
+@c Table of Contents
+@contents
+@end ifnottex
+
+@ifset makeinfo
 @node Top, Copying, (dir), (dir)
 @top Introduction
 
@@ -141,7 +155,7 @@ Invoking @code{gperf}
 @end detailmenu
 @end menu
 
-@end ifinfo
+@end ifset
 
 @node Copying, Contributors, Top, Top
 @unnumbered GNU GENERAL PUBLIC LICENSE
@@ -1366,5 +1380,9 @@ Foundation, 1989.
 
 @printindex cp
 
+@iftex
+@c Table of Contents
 @contents
+@end iftex
+
 @bye