show credit balance on invoices, #11564

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index bf3f3d7..478bb26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,8 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+TORRUS_ENABLED = 0
+
 # for cvs-upgrade-deploy target, the username who checked out the CVS copy.
 CVS_USER = ivan
 
@@ -123,8 +125,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/
 
-VERSION=2.1.1cvs
-TAG=freeside_2_1_1
+VERSION=2.3.0cvs
+TAG=freeside_2_3_0
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -210,7 +212,7 @@ perl-modules:
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
-       " blib/lib/FS/cust_main/*.pm;\
+       " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
@@ -261,6 +263,7 @@ install-apache:
        [ -d ${APACHE_CONF} ] && \
          ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
            ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+           ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \
            perl -p -i -e "\
              s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
              s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
@@ -287,7 +290,7 @@ update-selfservice:
          ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
        done
 
-install: install-perl-modules install-docs install-init install-apache install-rt install-texmf
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf
 
 deploy: install
        ${HTTPD_RESTART}
@@ -374,6 +377,20 @@ install-rt:
          s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
        " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
+configure-torrus:
+       cd torrus; \
+       torrus_user=freeside var_user=freeside var_group=freeside ./configure
+
+install-torrus:
+       if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \
+         make; \
+         make install; \
+         perl -p -i -e "\
+           s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+         " /usr/local/etc/torrus/conf/torrus-siteconfig.pl; \
+         torrus clearcache \
+       );fi
+
 clean:
        rm -rf masondocs
        rm -rf httemplate/docs/man