fix net sales amount (credits were being applied in wrong month), RT#7502

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 890ee0d..3405956 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ QUEUED_USER=fs_queue
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
-SELFSERVICE_MACHINES = localhost
+SELFSERVICE_MACHINES = 
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
@@ -115,10 +115,10 @@ RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.7.3
-TAG=freeside_1_7_3
+VERSION=1.7.4
+TAG=freeside_1_7_4
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -164,6 +164,7 @@ install-docs: docs
        cp htetc/handler.pl ${MASON_HANDLER}
          perl -p -i -e "\
            s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+           s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
            s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
            s'%%%MASONDATA%%%'${MASONDATA}'g;\
          " ${MASON_HANDLER}
@@ -198,6 +199,10 @@ perl-modules:
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+         s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
+       " blib/lib/FS/Cron/*.pm;\
+       perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
          s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
@@ -361,6 +366,7 @@ release:
        # Update the RPM specfile
        cvs edit ${RPM_SPECFILE}
        perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+       perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
        cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
 
        # Update the Debian changelog