summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Config/defs.mk.in2
-rw-r--r--configure.ac8
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 97b5acbc3..f90d84086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-26  Peter Stephenson  <pws@csr.com>
+
+	* 26998: configure.ac, Config/defs.mk.in: use --htmldir passed
+	to configure:  restore zsh default if unchanged from current
+	configure default of '${docdir}'.
+
 2009-05-25  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Ingmar Vanhassel: 26990: Doc/Makefile.in: tidy up all html
@@ -11770,5 +11776,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4699 $
+* $Revision: 1.4700 $
 *****************************************************
diff --git a/Config/defs.mk.in b/Config/defs.mk.in
index 5195bf8e0..69edf7005 100644
--- a/Config/defs.mk.in
+++ b/Config/defs.mk.in
@@ -50,7 +50,7 @@ fndir           = @fndir@
 sitefndir       = @sitefndir@
 scriptdir       = @scriptdir@
 sitescriptdir   = @sitescriptdir@
-htmldir         = $(datadir)/$(tzsh)/htmldoc
+htmldir         = @htmldir@
 
 # compilation
 CC              = @CC@
diff --git a/configure.ac b/configure.ac
index b22205dcc..01388ec9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl  support, updates, enhancements, or modifications.
 dnl
 
 AC_INIT(Src/zsh.h)
-AC_PREREQ(2.53b)
+AC_PREREQ(2.59c)
 AC_CONFIG_HEADER(config.h)
 
 dnl What version of zsh are we building ?
@@ -304,6 +304,12 @@ fi], [sitescriptdir=${datadir}/${tzsh_name}/scripts])
 AC_SUBST(scriptdir)dnl
 AC_SUBST(sitescriptdir)dnl
 
+dnl htmldir is already handled, but if it wasn't set, use
+dnl the standard zsh default.
+if test x$htmldir = x'${docdir}' || test x$htmldir = x; then
+  htmldir='$(datadir)/$(tzsh)/htmldoc'
+fi
+
 AH_TEMPLATE([CUSTOM_PATCHLEVEL],
 [Define to a custom value for the ZSH_PATCHLEVEL parameter])
 AC_ARG_ENABLE(custom-patchlevel,