From 13ba3f9128c68ed094ac61aea978da4df338b0b0 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 12 Mar 2009 01:04:18 +0000
Subject: [PATCH] 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.0@181543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 build_tools/make_version | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build_tools/make_version b/build_tools/make_version
index cf8201f8bb..fa536a71e8 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}