From: "Jun T." <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@zsh.org
Subject: [PATCH] if available, use texi2any instead of texi2html
Date: Fri, 22 May 2015 01:45:34 +0900 [thread overview]
Message-ID: <FF61B664-BB3D-49C7-8DAC-5FEF01FB48F8@kba.biglobe.ne.jp> (raw)
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)
next reply other threads:[~2015-05-21 16:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 16:45 Jun T. [this message]
2015-05-21 19:30 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=FF61B664-BB3D-49C7-8DAC-5FEF01FB48F8@kba.biglobe.ne.jp \
--to=takimoto-j@kba.biglobe.ne.jp \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).