From 01668d98a380896f0de09ba3f5809d4dd44fa71d Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 4 Mar 2010 22:21:02 +0100 Subject: [PATCH] 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 Signed-off-by: Aurelien Jarno --- Makefile | 7 +++++-- configure | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1f6c3ea900..bf2cef2ab5 100644 --- 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 8eb5f5be9d..f55baf09f3 100755 --- 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