mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-30 07:10:58 +02:00
Code Releases Activity

26998: use --htmldir, restore zsh default if unchanged from configure default

Browse source
This commit is contained in:
Peter Stephenson 2009-05-26 09:59:18 +00:00
parent ef9844b34c
commit 5ccb3c41fa
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2009-05-25 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Ingmar Vanhassel: 26990: Doc/Makefile.in: tidy up all html * Ingmar Vanhassel: 26990: Doc/Makefile.in: tidy up all html
@ -11770,5 +11776,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4699 $ * $Revision: 1.4700 $
***************************************************** *****************************************************

2
Config/defs.mk.in
View file

@ -50,7 +50,7 @@ fndir = @fndir@
sitefndir = @sitefndir@ sitefndir = @sitefndir@
scriptdir = @scriptdir@ scriptdir = @scriptdir@
sitescriptdir = @sitescriptdir@ sitescriptdir = @sitescriptdir@
htmldir = $(datadir)/$(tzsh)/htmldoc htmldir = @htmldir@
# compilation # compilation
CC = @CC@ CC = @CC@

8
configure.ac
View file

@ -26,7 +26,7 @@ dnl support, updates, enhancements, or modifications.
dnl dnl
AC_INIT(Src/zsh.h) AC_INIT(Src/zsh.h)
AC_PREREQ(2.53b) AC_PREREQ(2.59c)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
dnl What version of zsh are we building ? dnl What version of zsh are we building ?
@ -304,6 +304,12 @@ fi], [sitescriptdir=${datadir}/${tzsh_name}/scripts])
AC_SUBST(scriptdir)dnl AC_SUBST(scriptdir)dnl
AC_SUBST(sitescriptdir)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], AH_TEMPLATE([CUSTOM_PATCHLEVEL],
[Define to a custom value for the ZSH_PATCHLEVEL parameter]) [Define to a custom value for the ZSH_PATCHLEVEL parameter])
AC_ARG_ENABLE(custom-patchlevel, AC_ARG_ENABLE(custom-patchlevel,