[freeside-commits] freeside Makefile,1.210,1.211

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv5837

Modified Files:
	Makefile 
Log Message:
further refine check-conflicts to avoid false positives

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -w -d -r1.210 -r1.211
--- Makefile	15 Jun 2011 01:41:13 -0000	1.210
+++ Makefile	15 Jun 2011 02:38:25 -0000	1.211
@@ -409,7 +409,7 @@
 	make clean
 
 check-conflicts:
-	! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats --exclude=mason_handler. '^=======$$' .
+	! grep -r --exclude='*config.log.*' '--exclude=*config.status.*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler.*' '^=======$$' .
 
 #these are probably only useful if you're me...