From 589350c776c2c91ba4263f3469a015c673084d0f Mon Sep 17 00:00:00 2001
From: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
Date: Sat, 23 May 2015 00:55:52 +0900
Subject: 35255: if available, use texi2any instead of texi2html

---
 Doc/Makefile.in | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'Doc')

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)
 	( \
-- 
cgit 1.4.1