[libpri-commits] trunk - r275 in /trunk: ./ Makefile

[libpri-commits at lists.digium.com]

Author: kpfleming
Date: Thu Dec  1 18:57:34 2005
New Revision: 275

URL: http://svn.digium.com/view/libpri?rev=275&view=rev
Log:
Merged revisions 274 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r274 | kpfleming | 2005-12-01 17:13:49 -0600 (Thu, 01 Dec 2005) | 2 lines

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

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec  1 18:57:34 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-272
+/branches/1.2:1-274

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?rev=275&r1=274&r2=275&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Dec  1 18:57:34 2005
@@ -70,11 +70,14 @@
 all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 
 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
 
 install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)