[freeside-commits] freeside Makefile,1.196.2.10,1.196.2.11

[Ivan,,,]

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

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

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.196.2.10
retrieving revision 1.196.2.11
diff -u -w -d -r1.196.2.10 -r1.196.2.11
--- Makefile	15 Jun 2011 02:38:26 -0000	1.196.2.10
+++ Makefile	15 Jun 2011 02:40:11 -0000	1.196.2.11
@@ -394,7 +394,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...