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 67231ff0ca4861503e6026ca87cb044f3a94bc9f..98e31e6bf49edc977513607cacfd08c3fdd07fdd 100755 (executable)
--- 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}