X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=a454d08de9fecd19803f69d3c8375ea01c34fb10;hb=970dfae19db81ed3afdd9f7e15637907f84d5341;hp=8db4c1e494bf1c35cc68bfd54b9dad29537eeb54;hpb=30e0af53bde61f5272c942814140b78ce44815a5;p=freeside.git

diff --git a/Makefile b/Makefile
index 8db4c1e49..a454d08de 100644
--- a/Makefile
+++ b/Makefile
@@ -193,6 +193,7 @@ perl-modules:
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	  s'%%%RT_PATH%%%'${RT_PATH}'g; \
 	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
+	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
 	" blib/lib/FS/*.pm;\
 	perl -p -i -e "\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
@@ -409,7 +410,7 @@ clean:
 	make clean
 
 check-conflicts:
-	! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats '^=======$$' .
+	! 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...