提交 01668d98 编写于 作者: S Stefan Weil 提交者: Aurelien Jarno

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: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NAurelien Jarno <aurelien@aurel32.net>
上级 99aba0c4
...@@ -230,15 +230,18 @@ cscope: ...@@ -230,15 +230,18 @@ cscope:
cscope -b cscope -b
# documentation # documentation
MAKEINFO=makeinfo
MAKEINFOFLAGS=--no-headers --no-split --number-sections
TEXIFLAG=$(if $(V),,--quiet) TEXIFLAG=$(if $(V),,--quiet)
%.dvi: %.texi %.dvi: %.texi
$(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@") $(call quiet-command,texi2dvi $(TEXIFLAG) -I . $<," GEN $@")
%.html: %.texi %.html: %.texi
$(call quiet-command,texi2html -I=. -monolithic -number $<," GEN $@") $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) --html $< -o $@, \
" GEN $@")
%.info: %.texi %.info: %.texi
$(call quiet-command,makeinfo -I . $< -o $@," GEN $@") $(call quiet-command,$(MAKEINFO) $< -o $@," GEN $@")
%.pdf: %.texi %.pdf: %.texi
$(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@") $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<," GEN $@")
......
...@@ -1750,7 +1750,7 @@ fi ...@@ -1750,7 +1750,7 @@ fi
# Check if tools are available to build documentation. # Check if tools are available to build documentation.
if test "$docs" != "no" ; then if test "$docs" != "no" ; then
if has texi2html && has pod2man; then if has makeinfo && has pod2man; then
docs=yes docs=yes
else else
if test "$docs" = "yes" ; then if test "$docs" = "yes" ; then
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册