diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2008-02-03 18:17:13 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2008-02-03 18:17:13 +0000 |
| commit | d70c7f5f53c2d3fa910c0965c39a651186cb8649 (patch) | |
| tree | fabfc1cd1c7b84831027ce9f7ea752d49ffa38c9 | |
| parent | 07acd1d4f06607d4a3a82ed67beed74e2ac28b7e (diff) | |
| download | zsh-d70c7f5f53c2d3fa910c0965c39a651186cb8649.tar.gz zsh-d70c7f5f53c2d3fa910c0965c39a651186cb8649.tar.xz zsh-d70c7f5f53c2d3fa910c0965c39a651186cb8649.zip | |
24528: revert 24429.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Etc/zsh-development-guide | 10 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 500328749..47b272189 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-02-03 Clint Adams <clint@zsh.org> + * 24528: configure.ac, Etc/zsh-development-guide: + revert 24429. + * 24527: Completion/Unix/Command/_cut: a subset of the fixes from Mikael Magnusson in 24526. diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide index ca26aafed..793e2d255 100644 --- a/Etc/zsh-development-guide +++ b/Etc/zsh-development-guide @@ -856,13 +856,3 @@ The following parameters are currently used: distribution, but that need to be present in the CVS tree. This variable is not used by the zsh build process and is present for the convenience of external checks. - -Version Suffixes ----------------- -The configure script reads the version number from Config/version.mk. -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_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 d420534fd..8a56a4c05 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,6 @@ AC_CONFIG_HEADER(config.h) dnl What version of zsh are we building ? . ${srcdir}/Config/version.mk -VERSION="$VERSION$ZSH_VERSIONSUFFIX" echo "configuring for zsh $VERSION" dnl ---------------------------------------------- |