Documentation: Modify rule for html output (better looking output format)

To create html output from texi input, texi2html was used.
Output from makeinfo looks cleaner, so replace the old rule
and use makeinfo now.

For those who want to use their own variant of html output,
the macros MAKEINFO and MAKEINFOFLAGS allow customisation.
Option "-I ." is not needed (the current directory is
searched by default), so remove it.

Please note that the build requirements changed, too:
makeinfo is required for doc builds.
texi2html is no longer used.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/Makefile b/Makefile
index 1f6c3ea9008df11e9b825e92fdf77339c31ee8d1..bf2cef2ab54c62bc442ca1e42c5c6d7e35092a93 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -230,15 +230,18 @@ cscope:
        cscope -b
 
 # documentation
+MAKEINFO=makeinfo
+MAKEINFOFLAGS=--no-headers --no-split --number-sections
 TEXIFLAG=$(if $(V),,--quiet)
 %.dvi: %.texi
        $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<,"  GEN   $@")
 
 %.html: %.texi
-       $(call quiet-command,texi2html -I=. -monolithic -number $<,"  GEN   $@")
+       $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \
+       "  GEN   $@")
 
 %.info: %.texi
-       $(call quiet-command,makeinfo -I . $< -o $@,"  GEN   $@")
+       $(call quiet-command,$(MAKEINFO) $< -o $@,"  GEN   $@")
 
 %.pdf: %.texi
        $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")

diff --git a/configure b/configure
index 8eb5f5be9dc0ce2db0d913fad49df19e483a5bdc..f55baf09f33b95056f26b4fddd99f047c81823e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1750,7 +1750,7 @@ fi
 
 # Check if tools are available to build documentation.
 if test "$docs" != "no" ; then
-  if has texi2html && has pod2man; then
+  if has makeinfo && has pod2man; then
     docs=yes
   else
     if test "$docs" = "yes" ; then