[freeside-commits] freeside Makefile,1.211,1.212

[Ivan,,,]

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

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.211
retrieving revision 1.212
diff -u -w -d -r1.211 -r1.212
--- Makefile	15 Jun 2011 02:38:25 -0000	1.211
+++ Makefile	15 Jun 2011 02:40:10 -0000	1.212
@@ -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...