adding export to read mailbox status information, RT#15987

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 8db4c1e..79e0fdd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ INIT_FILE = /etc/init.d/freeside
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb
-INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 23 01
+INIT_INSTALL = PATH=$PATH:/sbin /usr/sbin/update-rc.d freeside defaults 23 01
 #redhat, fedora
 #INIT_INSTALL = /sbin/chkconfig freeside on
 #not necessary (freebsd)
@@ -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...