[PATCH] if available, use texi2any instead of texi2html

[PATCH] if available, use texi2any instead of texi2html

[Jun T.]

This is the patch to use texi2any if available.
Please try if you have texinfo-5.

---
 Doc/Makefile.in | 14 +++++++++-----
 configure.ac    |  7 ++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index a420781..7645f42 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 e4de193..6a99aec 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
-- 
1.9.5 (Apple Git-50.3)

Re: [PATCH] if available, use texi2any instead of texi2html

[Peter Stephenson]

On Fri, 22 May 2015 01:45:34 +0900
"Jun T." <takimoto-j@kba.biglobe.ne.jp> wrote:
> This is the patch to use texi2any if available.
> Please try if you have texinfo-5.

Couldn't see any obvious problem.

pws