use new tag version numbering script

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2194 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 14 insertions, 3 deletions

diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name
index 525d282..60eeb11 100755
--- a/build_tools/make_svn_branch_name
+++ b/build_tools/make_svn_branch_name
@@ -4,6 +4,7 @@ PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/zaptel/
 BETA=0
 BRANCH=0
 TEAM=0
+TAG=0
 
 REV=`svnversion -c . | cut -d: -f2`
 
@@ -21,6 +22,12 @@ do
       break
   fi
 
+  if [ ${TAG} != 0 ]
+  then
+      RESULT="${PART}"
+      break
+  fi
+
   if [ ${BRANCH} != 0 ]
   then
       RESULT="${RESULT}-${PART}"
@@ -49,8 +56,7 @@ do
 
   if [ "${PART}" = "tags" ]
   then
-      BRANCH=1
-      RESULT="tag"
+      TAG=1
       continue
   fi
 
@@ -61,4 +67,9 @@ do
   fi
 done
 
-echo ${RESULT##-}-r${REV}
+if [ ${TAG} != 0 ]
+then
+    echo ${RESULT}
+else
+    echo ${RESULT##-}-r${REV}
+fi