[postgis-tickets] r14731 - Set version from Version.config for branch dists too

[Sandro Santilli]

Author: strk
Date: 2016-03-01 09:48:33 -0800 (Tue, 01 Mar 2016)
New Revision: 14731

Modified:
   trunk/make_dist.sh
Log:
Set version from Version.config for branch dists too

See #3482

Modified: trunk/make_dist.sh
===================================================================
--- trunk/make_dist.sh	2016-03-01 15:46:14 UTC (rev 14730)
+++ trunk/make_dist.sh	2016-03-01 17:48:33 UTC (rev 14731)
@@ -22,7 +22,6 @@
 if [ -n "$1" ]; then
   if [ "$1" = "-b" ]; then
     shift
-    version=$1
     tag="branches/$1"
   else
     version="$1"
@@ -82,7 +81,7 @@
 
 # Find a better version name when fetching
 # a development branch
-if test "$tag" = "trunk"; then
+if test "$version" = "dev"; then
   echo "Tweaking version for development snapshot"
   VMAJ=`grep ^POSTGIS_MAJOR_VERSION "$outdir"/Version.config | cut -d= -f2`
   VMIN=`grep ^POSTGIS_MINOR_VERSION "$outdir"/Version.config | cut -d= -f2`