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

Update the make_version file to the latest Asterisk version with the
appropriate libpri required chage.


git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@705 2fbb986a-6c06-0410-b554-c9c1f0a7f128

build_tools/make_version

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -f ${1}/.version ]; then
-	cat ${1}/.version
+    cat ${1}/.version
 elif [ -d .svn ]; then
     PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/libpri/::' | sed -e 's:/: :g'`
     BRANCH=0
@@ -10,63 +10,70 @@ 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
+    if [ "${PARTS}" = "trunk" ] ; then
-	echo SVN-trunk-r${REV}
+        echo SVN-trunk-r${REV}
-	exit 0
+        exit 0
-	fi
+    fi
 
     for PART in $PARTS ; do
-      if [ ${TAG} != 0 ] ; then
+        if [ ${TAG} != 0 ] ; then
-	    if [ "${PART}" = "autotag_for_be" ] ; then
+            if [ "${PART}" = "autotag_for_be" ] ; then
-	      continue
+                continue
-	    fi
+            fi
-	    if [ "${PART}" = "autotag_for_sx00i" ] ; then
+            if [ "${PART}" = "autotag_for_sx00i" ] ; then
-	      continue
+                continue
-	    fi
+            fi
-	    RESULT="${PART}"
+            RESULT="${PART}"
-	    break
+            break
-      fi
+        fi
 
-      if [ ${BRANCH} != 0 ] ; then
+        if [ ${BRANCH} != 0 ] ; then
-        if [ -z ${RESULT} ] ; then
+            if [ -z "${RESULT}" ] ; then
-          RESULT="${PART}"
+                RESULT="${PART}"
-        else
+            else
-          RESULT="${RESULT}-${PART}"
+                RESULT="${RESULT}-${PART}"
+            fi
+            break
         fi
-	    break
-      fi
 
-      if [ ${TEAM} != 0 ] ; then
+        if [ ${TEAM} != 0 ] ; then
-        if [ -z ${RESULT} ] ; then
+            if [ -z "${RESULT}" ] ; then
-           RESULT="${PART}"
+                RESULT="${PART}"
-        else
+            else
-          RESULT="${RESULT}-${PART}"
+                RESULT="${RESULT}-${PART}"
+            fi
+            continue
         fi
-        continue
-      fi
 
-      if [ "${PART}" = "branches" ] ; then
+        if [ "${PART}" = "branches" ] ; then
-        BRANCH=1
+            BRANCH=1
-        RESULT="branch"
+            RESULT="branch"
-        continue
+            continue
-      fi
+        fi
 
-      if [ "${PART}" = "tags" ] ; then
+        if [ "${PART}" = "tags" ] ; then
-        TAG=1
+            TAG=1
-        continue
+            continue
-      fi
+        fi
 
-      if [ "${PART}" = "team" ] ; then
+        if [ "${PART}" = "team" ] ; then
-        TEAM=1
+            TEAM=1
-        continue
+            continue
-      fi
+        fi
     done
 
     if [ ${TAG} != 0 ] ; then
-	echo ${RESULT}
+        echo ${RESULT}
     else
-	echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
+        echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
     fi
+else
+    echo "UNKNOWN__and_probably_unsupported"
 fi