From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Tue, 15 Jun 2010 07:18:24 +0000 (-0600)
Subject: Maintenance: snapshot detect package name and version better.
X-Git-Tag: SQUID_3_2_0_1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03cfcfc09185442d92bcf3c45d7e98374ed7225;p=thirdparty%2Fsquid.git

Maintenance: snapshot detect package name and version better.

The old patterns are no longer unique. Were setting the snapshot package
and version variables wrong.
Detect and use the formal PACKAGE_FOO=FOO settings instead now.
---

diff --git a/mksnapshot.sh b/mksnapshot.sh
index 95edffc2b8..6c4209fea5 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -33,8 +33,8 @@ if [ ! -f $tmpdir/configure ]; then
 fi
 
 cd $tmpdir
-eval `grep "^ *VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/-CVS//'`
-eval `grep "^ *PACKAGE=" configure`
+eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/-CVS//' | sed -e 's/PACKAGE_//'`
+eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
 ed -s configure.in <<EOS
 g/${VERSION}-[A-Z]*/ s//${VERSION}-${date}/
 w