generate version string properly

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4343 a0bf4364-ded3-4de4-8d8a-66a801d63aff

3 files changed, 4 insertions, 63 deletions

diff --git a/Makefile b/Makefile
index 478b7e8..002a5e9 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ ifneq ($(wildcard .version),)
   DAHDIVERSION:=$(shell cat .version)
 else
 ifneq ($(wildcard .svn),)
-  DAHDIVERSION=SVN-$(shell build_tools/make_svn_branch_name)
+  DAHDIVERSION=$(shell build_tools/make_version . dahdi/linux)
 endif
 endif
 
@@ -142,6 +142,8 @@ endif
 install-include:
 	install -D -m 644 include/dahdi/kernel.h $(DESTDIR)/usr/include/dahdi/kernel.h
 	install -D -m 644 include/dahdi/user.h $(DESTDIR)/usr/include/dahdi/user.h
+# Include any driver-specific header files here
+	install -D -m 644 include/dahdi/wctdm_user.h $(DESTDIR)/usr/include/dahdi/wctdm_user.h
 
 devices:
 ifneq (yes,$(DYNFS))
diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name
deleted file mode 100755
index b4b712d..0000000
--- a/build_tools/make_svn_branch_name
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/zaptel/:: | sed -e 's:/: :g'`
-BRANCH=0
-TEAM=0
-TAG=0
-
-REV=`svnversion -c . | cut -d: -f2`
-
-if [ "${PARTS}" = "trunk" ]
-then
-    echo 'trunk'-r${REV}
-    exit 0
-fi
-
-for PART in $PARTS
-do
-  if [ ${TAG} != 0 ]
-  then
-      RESULT="${PART}"
-      break
-  fi
-
-  if [ ${BRANCH} != 0 ]
-  then
-      RESULT="${RESULT}-${PART}"
-      break
-  fi
-
-  if [ ${TEAM} != 0 ]
-  then
-      RESULT="${RESULT}-${PART}"
-      continue
-  fi
-
-  if [ "${PART}" = "branches" ]
-  then
-      BRANCH=1
-      RESULT="branch"
-      continue
-  fi
-
-  if [ "${PART}" = "tags" ]
-  then
-      TAG=1
-      continue
-  fi
-
-  if [ "${PART}" = "team" ]
-  then
-      TEAM=1
-      continue
-  fi
-done
-
-if [ ${TAG} != 0 ]
-then
-    echo ${RESULT}
-else
-    echo ${RESULT##-}-r${REV}
-fi
diff --git a/build_tools/make_version b/build_tools/make_version
index d710ffa..e6caaa2 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -5,7 +5,7 @@ if [ -f ${1}/.version ]; then
 elif [ -f ${1}/.svnrevision ]; then
 	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
 elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/zaptel/:: | sed -e 's:/: :g'`
+    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/${2}/:: | sed -e 's:/: :g'`
     BRANCH=0
     TEAM=0