Merged revisions 841,843 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r841 | kpfleming | 2005-12-01 17:14:59 -0600 (Thu, 01 Dec 2005) | 2 lines

Makefile 'update' target now supports updating from Subversion repositories (issue #5875)

........
r843 | russell | 2005-12-01 18:03:01 -0600 (Thu, 01 Dec 2005) | 2 lines

fix udev support for 2.6.15 (issue #5891)

........


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

1 files changed, 5 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index d53412b..84f3663 100644
--- a/Makefile
+++ b/Makefile
@@ -394,11 +394,14 @@ config:
 	fi
 
 update:
-	@if [ -d CVS ]; then \
+	@if [ -d .svn ]; then \
+		echo "Updating from Subversion..." ; \
+		svn update -q; \
+	elif [ -d CVS ]; then \
 		echo "Updating from CVS..." ; \
 		cvs -q -z3 update -Pd; \
 	else \
-		echo "Not CVS";  \
+		echo "Not under version control"; \
 	fi
 
 clean: