Port package version check update from 3.1

diff --git a/mkrelease.sh b/mkrelease.sh
index df6a498ba847ea25b62dbe2b0fbee451aa73fe52..c2524b3907d4450b5c00b62f191930f38d91d141 100755 (executable)
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -43,8 +43,9 @@ if [ ! -f $tmpdir/configure ]; then
 fi
 
 cd $tmpdir
-eval `grep "^ *VERSION=" configure | sed -e 's/-BZR//'`
-eval `grep "^ *PACKAGE=" configure`
+./bootstrap.sh
+eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'`
+eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'`
 if [ ${name} != ${PACKAGE}-${VERSION} ]; then
        echo "ERROR! The tag and configure version numbers do not match!"
        echo "${name} != ${PACKAGE}-${VERSION}"