summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Etc/zsh-development-guide4
-rw-r--r--configure.ac2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 70512d2cf..c5839bba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-22  Clint Adams  <clint@zsh.org>
 
+	* 24429: configure.ac, Etc/zsh-development-guide:
+	use ZSH_VERSIONSUFFIX instead of ZSH_EXTRAVERSION.
+
 	* Frank Terbeck: 24413: Completion/Unix/Command/_git: handle
 	completion when git aliases are used.
 
diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide
index f0a5ac80e..ca26aafed 100644
--- a/Etc/zsh-development-guide
+++ b/Etc/zsh-development-guide
@@ -860,9 +860,9 @@ The following parameters are currently used:
 Version Suffixes
 ----------------
 The configure script reads the version number from Config/version.mk.
-If the environment variable ZSH_EXTRAVERSION is set, the string
+If the environment variable ZSH_VERSIONSUFFIX is set, the string
 contained therein will be appended to the version string.  For example,
 if Config/version.mk contains "VERSION=4.3.4-dev-7" and
-ZSH_EXTRAVERSION is set to "-ca", $ZSH_VERSION in the shell built from
+ZSH_VERSIONSUFFIX is set to "-ca", $ZSH_VERSION in the shell built from
 that run will equal "4.3.4-dev-7-ca".  Caution is recommended when
 using this feature, as is-at-least may misunderstand your conventions.
diff --git a/configure.ac b/configure.ac
index 2d0ba52a6..d420534fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_CONFIG_HEADER(config.h)
 
 dnl What version of zsh are we building ?
 . ${srcdir}/Config/version.mk
-VERSION="$VERSION$ZSH_EXTRAVERSION"
+VERSION="$VERSION$ZSH_VERSIONSUFFIX"
 echo "configuring for zsh $VERSION"
 
 dnl ----------------------------------------------