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

diff --git a/Makefile b/Makefile
index 8db4c1e49..47b637c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -118,8 +118,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/
 
-VERSION=2.3.0cvs
-TAG=freeside_2_3_0
+VERSION=2.3.1cvs
+TAG=freeside_2_3_1
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -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...