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

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

diff --git a/Makefile b/Makefile
index b9afd42e0..bb99a7b79 100644
--- a/Makefile
+++ b/Makefile
@@ -409,7 +409,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...