diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Makefile.in | 14 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 62759b034..ceda73787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-23 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * 35255: configure.sc, Doc/Makefile.in: if available, use + texi2any instead of texi2html + 2015-05-22 Daniel Hahler <zsh@thequod.de> * 35261: Completion/Unix/Command/_git: make $ret local in diff --git a/Doc/Makefile.in b/Doc/Makefile.in index a420781ee..7645f42f7 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -41,8 +41,7 @@ LN_S = @LN_S@ MAKEINFO = makeinfo TEXI2DVI = texi2dvi DVIPS = dvips -TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files \ - --init-file texi2html.conf +TEXI2HTML = @TEXI2HTML@ .SUFFIXES: .yo .1 @@ -163,7 +162,8 @@ html: zsh_toc.html .PHONY: html zsh_toc.html: $(sdir)/zsh.texi texi2html.conf - $(TEXI2HTML) $(sdir)/zsh.texi + $(TEXI2HTML) --output . --ifinfo --split=chapter --node-files \ + --init-file texi2html.conf $(sdir)/zsh.texi zshall.1: zsh.yo @case $@ in \ @@ -252,8 +252,12 @@ version.yo: $(sdir_top)/Config/version.mk ) > $(sdir)/version.yo texi2html.conf: $(sdir_top)/Config/version.mk - echo '$$PRE_BODY_CLOSE = "<font size=\"-1\">Zsh version $(VERSION), released on $(VERSION_DATE).</font>";' \ - > $@ + d=`echo $(VERSION_DATE)`; \ + v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \ + case '$(TEXI2HTML)' in \ + *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \ + *) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \ + esac > $@ Zsh/modlist.yo: $(MODDOCSRC) ( \ diff --git a/configure.ac b/configure.ac index e4de193ed..6a99aec1d 100644 --- a/configure.ac +++ b/configure.ac @@ -634,7 +634,12 @@ AC_SUBST(YODL_OPTIONS) AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex]) AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], []) -AC_CHECK_PROGS([TEXI2HTML], [texi2html], []) +AC_CHECK_PROGS([TEXI2HTML], [texi2any texi2html], [: texi2html]) + +if test x"$TEXI2HTML" = xtexi2any; then + TEXI2HTML='texi2any -c TEXI2HTML=1' +fi + AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr]) if test x"$ansi2knr" = xyes && test x"$ANSI2KNR" = x": ansi2knr"; then |