From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9385 invoked by alias); 21 May 2015 16:46:17 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 35255 Received: (qmail 12418 invoked from network); 21 May 2015 16:46:12 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.0 X-Biglobe-Sender: From: "Jun T." Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: [PATCH] if available, use texi2any instead of texi2html Message-Id: Date: Fri, 22 May 2015 01:45:34 +0900 To: zsh-workers@zsh.org Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) X-Mailer: Apple Mail (2.1878.6) X-Biglobe-Spnum: 58201 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 =3D @LN_S@ MAKEINFO =3D makeinfo TEXI2DVI =3D texi2dvi DVIPS =3D dvips -TEXI2HTML =3D @TEXI2HTML@ --output . --ifinfo --split=3Dchapter = --node-files \ - --init-file texi2html.conf +TEXI2HTML =3D @TEXI2HTML@ =20 .SUFFIXES: .yo .1 =20 @@ -163,7 +162,8 @@ html: zsh_toc.html .PHONY: html =20 zsh_toc.html: $(sdir)/zsh.texi texi2html.conf - $(TEXI2HTML) $(sdir)/zsh.texi + $(TEXI2HTML) --output . --ifinfo --split=3Dchapter --node-files = \ + --init-file texi2html.conf $(sdir)/zsh.texi =20 zshall.1: zsh.yo @case $@ in \ @@ -252,8 +252,12 @@ version.yo: $(sdir_top)/Config/version.mk ) > $(sdir)/version.yo =20 texi2html.conf: $(sdir_top)/Config/version.mk - echo '$$PRE_BODY_CLOSE =3D "Zsh version = $(VERSION), released on $(VERSION_DATE).";' \ - > $@ + d=3D`echo $(VERSION_DATE)`; \ + v=3D"Zsh version $(VERSION), released on = $$d."; \ + case '$(TEXI2HTML)' in \ + *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" = ;; \ + *) echo "\$$PRE_BODY_CLOSE =3D '$$v';" ;; \ + esac > $@ =20 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) =20 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" =3D xtexi2any; then + TEXI2HTML=3D'texi2any -c TEXI2HTML=3D1' +fi + AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr]) =20 if test x"$ansi2knr" =3D xyes && test x"$ANSI2KNR" =3D x": ansi2knr"; = then --=20 1.9.5 (Apple Git-50.3)