[zaptel-commits] trunk r1119 - /trunk/Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jun 19 10:18:13 2006
New Revision: 1119

URL: http://svn.digium.com/view/zaptel?rev=1119&view=rev
Log:
remove support for CVS checkouts

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1119&r1=1118&r2=1119&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jun 19 10:18:13 2006
@@ -98,15 +98,8 @@
   ZAPTELVERSION:=$(shell cat .version)
 endif
 
-# CVS mirrors of SVN have .svnrevision files showing
-# which SVN revision they are based on, and .svnbranch
-# showing the branch they are made from
-ifneq ($(wildcard .svnrevision),)
-  ZAPTELVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
-else
-  ifneq ($(wildcard .svn),)
-    ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
-  endif
+ifneq ($(wildcard .svn),)
+  ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
 endif
 
 TZOBJS:=zonedata.lo tonezone.lo
@@ -405,15 +398,6 @@
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
-	elif [ -d CVS ]; then \
-		echo "Updating from CVS..." ; \
-		cvs -q -z3 update -Pd | tee update.out; \
-		rm -f .version; \
-		if [ `grep -c ^C update.out` -gt 0 ]; then \
-			echo ; echo "The following files have conflicts:" ; \
-			grep ^C update.out | cut -d' ' -f2- ; \
-		fi ; \
-		rm -f update.out; \
 	else \
 		echo "Not under version control";  \
 	fi