From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 12 Mar 2009 01:05:19 +0000 (+0000)
Subject: Merged revisions 181542 via svnmerge from
X-Git-Tag: 1.6.1.0-rc3~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06e2bffc8b7f92b52b2ad52cf308ac133b014812;p=thirdparty%2Fasterisk.git

Merged revisions 181542 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181542 | rmudgett | 2009-03-11 20:00:29 -0500 (Wed, 11 Mar 2009) | 1 line

  Use the correct branch integrated property when generating the version string
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@181544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/build_tools/make_version b/build_tools/make_version
index 67231ff0ca..98e31e6bf4 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -10,7 +10,12 @@ elif [ -d .svn ]; then
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
-    BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
+    INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
+    if [ -z "${INTEGRATED}" ] ; then
+    	INTEGRATED=svnmerge-integrated
+    fi
+
+    BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
 
     if [ "${PARTS}" = "trunk" ] ; then
 	echo SVN-trunk-r${REV}