diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2010-03-04 22:21:02 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-03-06 23:07:09 +0100 |
| commit | 01668d98a380896f0de09ba3f5809d4dd44fa71d (patch) | |
| tree | 1420c38533c6bcc5cee67e4cefdf069eac9a169c | |
| parent | 99aba0c41b6e817661ddf2ad90111c2d8af00050 (diff) | |
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>
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 6 insertions, 3 deletions
@@ -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 $@") @@ -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 |