From: Sandro Santilli <strk@keybit.net>
Date: Tue, 1 Mar 2016 17:48:33 +0000 (+0000)
Subject: Set version from Version.config for branch dists too
X-Git-Tag: 2.3.0beta1~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc0370353b2ec56e1253679524c821aed76e83af;p=postgis

Set version from Version.config for branch dists too

See #3482

git-svn-id: http://svn.osgeo.org/postgis/trunk@14731 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/make_dist.sh b/make_dist.sh
index dc11f21ef..68b0e424f 100755
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -22,7 +22,6 @@ version=dev
 if [ -n "$1" ]; then
   if [ "$1" = "-b" ]; then
     shift
-    version=$1
     tag="branches/$1"
   else
     version="$1"
@@ -82,7 +81,7 @@ cd "$owd"
 
 # 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`