require Time::Local 1.04 on perls before 5.6

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index da56c73..5377ce8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ TEMPLATE = asp
 #TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+MASON_HANDLER = /usr/local/etc/freeside/handler.pl
+MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb, others?
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -35,7 +37,7 @@ INSTALLGROUP = root
 
 #edit the stuff below to have the daemons start
 
-QUEUED_USER=fs_queue
+QUEUED_USER=ivan
 
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
@@ -56,8 +58,8 @@ SELFSERVICE_MACHINE = localhost
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre1
-TAG=freeside_1_5_0pre1
+VERSION=1.4.1rc3
+TAG=freeside_1_4_1rc3
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -115,6 +117,9 @@ install-docs: docs
        [ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
        [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
        [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+       [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+       [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+       [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
 perl-modules:
        cd FS; \
@@ -137,6 +142,8 @@ install-init:
          s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
          s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
          s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+         s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
        " ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
@@ -183,11 +190,12 @@ clean:
 #these are probably only useful if you're me...
 
 upload-docs: forcehtmlman
-       ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-       scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs
+       ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+       scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/docs
 
+#release: upload-docs update-webdemo
 release: upload-docs
-       cd /home/ivan/freeside
+       cd /home/ivan/freeside1.4
        #cvs tag ${TAG}
        cvs tag -F ${TAG}
 
@@ -199,7 +207,7 @@ release: upload-docs
        mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-       ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+       ssh ivan@pouncequick.420.am '( cd freeside; cvs update -r FREESIDE_1_4_BRANCH -d -P )'
        #ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
        ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'