summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-05-30 22:28:50 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-05-30 22:28:50 +0000
commitcf486f41a4240f23b8ff954c14dd09bdd6c005ab (patch)
tree96608cbaf831453bbf86f50d1a76a23e72b6ad63
parentbd35231e70c8d1427f1c52cc410a581d0f181487 (diff)
downloadzsh-cf486f41a4240f23b8ff954c14dd09bdd6c005ab.tar.gz
zsh-cf486f41a4240f23b8ff954c14dd09bdd6c005ab.tar.xz
zsh-cf486f41a4240f23b8ff954c14dd09bdd6c005ab.zip
Jesse W: 27024: allow overriding TEXI2HTML.
-rw-r--r--ChangeLog7
-rw-r--r--Doc/Makefile.in2
-rw-r--r--configure.ac1
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 81fbeb60e..7201cb08b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-30  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Jesse W: 27024: configure.ac, Doc/Makefile.in: allow
+	overriding TEXI2HTML.
+
 2009-05-30  Clint Adams  <clint@zsh.org>
 
 	* 27025: Src/system.h: define _GNU_SOURCE on the Hurd.
@@ -11790,5 +11795,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4703 $
+* $Revision: 1.4704 $
 *****************************************************
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 0b8cab5eb..3374ea705 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -40,7 +40,7 @@ INSTALL         = @INSTALL@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 DVIPS = dvips
-TEXI2HTML = texi2html --output . --ifinfo --split=chapter --node-files
+TEXI2HTML = @TEXI2HTML@ --output . --ifinfo --split=chapter --node-files
 
 .SUFFIXES: .yo .1
 
diff --git a/configure.ac b/configure.ac
index 01388ec9b..72f50eac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,6 +540,7 @@ AC_PROG_EGREP               dnl sets $EGREP to grep -E or egrep
 AC_CHECK_PROGS([YODL], [yodl], [: yodl])
 AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex])
 AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], [])
+AC_CHECK_PROGS([TEXI2HTML], [texi2html], [])
 AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr])
 
 if test x"$ansi2knr" = xyes && test x"$ANSI2KNR" = x": ansi2knr"; then