From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18706 invoked from network); 3 Feb 2008 18:14:17 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.4 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 3 Feb 2008 18:14:17 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 58991 invoked from network); 3 Feb 2008 18:14:13 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 3 Feb 2008 18:14:13 -0000 Received: (qmail 28774 invoked by alias); 3 Feb 2008 18:14:09 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 24528 Received: (qmail 28755 invoked from network); 3 Feb 2008 18:14:09 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 3 Feb 2008 18:14:09 -0000 Received: from acolyte.scowler.net (acolyte.scowler.net [216.254.112.45]) by bifrost.dotsrc.org (Postfix) with ESMTP id CA96580482A1 for ; Sun, 3 Feb 2008 19:14:02 +0100 (CET) Received: by acolyte.scowler.net (Postfix, from userid 1000) id B4B8D5C1A8; Sun, 3 Feb 2008 13:14:01 -0500 (EST) Date: Sun, 3 Feb 2008 13:14:01 -0500 From: Clint Adams To: zsh-workers@sunsite.dk Subject: PATCH: remove ZSH_VERSIONSUFFIX Message-ID: <20080203181401.GA15120@scowler.net> Mail-Followup-To: zsh-workers@sunsite.dk MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) X-Virus-Scanned: ClamAV 0.91.2/5670/Sun Feb 3 15:33:19 2008 on bifrost X-Virus-Status: Clean Since this doesn't work as-is, I'm backing it out and will probably do sed substitutions on Config/version.mk as needed. Index: configure.ac =================================================================== RCS file: /cvsroot/zsh/zsh/configure.ac,v retrieving revision 1.91 diff -u -r1.91 configure.ac --- configure.ac 1 Feb 2008 11:31:36 -0000 1.91 +++ configure.ac 3 Feb 2008 18:11:52 -0000 @@ -31,7 +31,6 @@ dnl What version of zsh are we building ? . ${srcdir}/Config/version.mk -VERSION="$VERSION$ZSH_VERSIONSUFFIX" echo "configuring for zsh $VERSION" dnl ---------------------------------------------- Index: Etc/zsh-development-guide =================================================================== RCS file: /cvsroot/zsh/zsh/Etc/zsh-development-guide,v retrieving revision 1.17 diff -u -r1.17 zsh-development-guide --- Etc/zsh-development-guide 22 Jan 2008 01:59:26 -0000 1.17 +++ Etc/zsh-development-guide 3 Feb 2008 18:11:52 -0000 @@ -856,13 +856,3 @@ 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.