X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=6256ccc3e8503e12231060b405e3c1153b34ecbb;hp=adb9d61df5cfbecaf10606c6958e33526aaedd45;hb=0ebeec96313dd7edfca340f01f8fbbbac1f4aa1d;hpb=25fdab941288302f1aa8063d4e237f62876c59b8

diff --git a/Makefile b/Makefile
index adb9d61df..6256ccc3e 100644
--- 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
@@ -26,12 +28,12 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 
-FREESIDE_RESTART = $INIT_FILE restart
+FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, others?
 INSTALLGROUP = root
 #freebsd
-INSTALLGROUP = wheel
+#INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
 
@@ -48,13 +50,16 @@ SIGNUP_MACHINE = localhost
 SIGNUP_AGENTNUM = 2
 SIGNUP_REFNUM = 2
 
+SELFSERVICE_USER = fs_selfservice
+SELFSERVICE_MACHINE = localhost
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.5.0pre1
-TAG=freeside_1_5_0pre1
+VERSION=1.5.0pre3
+TAG=freeside_1_5_0pre3
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -95,6 +100,7 @@ htmlman:
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
 	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
+	chmod a+rx bin/pod2x
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 forcehtmlman:
@@ -111,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; \
@@ -133,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