[svn-commits] trunk - r844 in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Thu Dec  1 18:58:55 2005
New Revision: 844

URL: http://svn.digium.com/view/zaptel?rev=844&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec  1 18:58:55 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-839
+/branches/1.2:1-843

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=844&r1=843&r2=844&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Dec  1 18:58:55 2005
@@ -394,11 +394,14 @@
 	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: