From: ivan <ivan>
Date: Wed, 15 Jun 2011 02:38:26 +0000 (+0000)
Subject: further refine check-conflicts to avoid false positives
X-Git-Tag: freeside_2_1_3~133
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=8c039243bb832cf9c8d382a5f5c46fa3408d4042;p=freeside.git

further refine check-conflicts to avoid false positives
---

diff --git a/Makefile b/Makefile
index 30008d598..cf8bc045a 100644
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,7 @@ clean:
 	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...