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

Copied the make_version file from Asterisk trunk.


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

build_tools/make_version

@@ -10,18 +10,20 @@ 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
 
-    if [ "${PARTS}" = "trunk" ]
+    BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
-	then
+
+    if [ "${PARTS}" = "trunk" ] ; then
         echo SVN-trunk-r${REV}
         exit 0
     fi
 
-    for PART in $PARTS
+    for PART in $PARTS ; do
-      do
+        if [ ${TAG} != 0 ] ; then
-      if [ ${TAG} != 0 ]
-	  then
             if [ "${PART}" = "autotag_for_be" ] ; then
                 continue
             fi
@@ -32,10 +34,8 @@ elif [ -d .svn ]; then
             break
         fi
 
-      if [ ${BRANCH} != 0 ]
+        if [ ${BRANCH} != 0 ] ; then
-	  then
+            if [ -z "${RESULT}" ] ; then
-	  if [ -z ${RESULT} ]
-	    then
                 RESULT="${PART}"
             else
                 RESULT="${RESULT}-${PART}"
@@ -43,10 +43,8 @@ elif [ -d .svn ]; then
             break
         fi
 
-      if [ ${TEAM} != 0 ]
+        if [ ${TEAM} != 0 ] ; then
-	  then
+            if [ -z "${RESULT}" ] ; then
-	  if [ -z ${RESULT} ]
-	    then
                 RESULT="${PART}"
             else
                 RESULT="${RESULT}-${PART}"
@@ -54,30 +52,28 @@ elif [ -d .svn ]; then
             continue
         fi
 
-      if [ "${PART}" = "branches" ]
+        if [ "${PART}" = "branches" ] ; then
-	  then
             BRANCH=1
             RESULT="branch"
             continue
         fi
 
-      if [ "${PART}" = "tags" ]
+        if [ "${PART}" = "tags" ] ; then
-	  then
             TAG=1
             continue
         fi
 
-      if [ "${PART}" = "team" ]
+        if [ "${PART}" = "team" ] ; then
-	  then
             TEAM=1
             continue
         fi
     done
 
-    if [ ${TAG} != 0 ]
+    if [ ${TAG} != 0 ] ; then
-	then
         echo ${RESULT}
     else
         echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
     fi
+else
+    echo "UNKNOWN__and_probably_unsupported"
 fi