[zaptel-commits] branch 1.2 r1071 - /branches/1.2/Makefile

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed May 17 17:26:53 2006
New Revision: 1071

URL: http://svn.digium.com/view/zaptel?rev=1071&view=rev
Log:
fix more buglets from my recent cleanups

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1071&r1=1070&r2=1071&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed May 17 17:26:53 2006
@@ -367,7 +367,7 @@
 		echo "Updating from Subversion..." ; \
 		svn update | tee update.out; \
 		rm -f .version; \
-		if [ `grep -q -c ^C update.out` -gt 0 ]; then \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
@@ -376,7 +376,7 @@
 		echo "Updating from CVS..." ; \
 		cvs -q -z3 update -Pd | tee update.out; \
 		rm -f .version; \
-		if [ `grep -q -c ^C update.out` -gt 0 ]; then \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
 			grep ^C update.out | cut -d' ' -f2- ; \
 		fi ; \