X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=3f5e18d47155d7677ed16f3bbd8ee98c57e81fa9;hp=9022d2b70794b3e5ded68723c6c4e28d9b0b52c0;hb=ab33e906a196646c5351c21848b5d6f63b4400dd;hpb=8f136821c88849319e91c4482d18d5092ce5a5b2

diff --git a/Makefile b/Makefile
index 9022d2b70..3f5e18d47 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 DB_USER = freeside
 DB_PASSWORD=
 
-#TEMPLATE = asp
-TEMPLATE = mason
+TEMPLATE = asp
+#TEMPLATE = mason
 
 ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 
@@ -18,13 +18,32 @@ INIT_FILE = /etc/init.d/freeside
 HTTPD_RESTART = /etc/init.d/apache restart
 FREESIDE_RESTART = /etc/init.d/freeside restart
 
+INSTALLGROUP = root
+
+#edit the stuff below to have the daemons start
+
+QUEUED_USER=ivan
+
+#eventually this shouldn't be needed
+FREESIDE_PATH = `pwd`
+
+PASSWD_USER = nostart
+PASSWD_MACHINE = localhost
+
+SIGNUP_USER = nostart
+SIGNUP_MACHINE = localhost
+SIGNUP_AGENTNUM = 2
+SIGNUP_REFNUM = 2
+
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
 
-VERSION=1.4.0pre12
-TAG=freeside_1_4_0_pre12
+#VERSION=1.4.0pre14
+#TAG=freeside_1_4_0_pre14
+VERSION=1.4.0beta1
+TAG=freeside_1_4_0_beta1
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -57,8 +76,16 @@ htmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -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
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
+forcehtmlman:
+	[ -e ./httemplate/docs/man ] || mkdir httemplate/docs/man
+	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
+	[ -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
+	bin/pod2x
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -77,7 +104,18 @@ install-perl-modules: perl-modules
 	make install UNINST=1
 
 install-init:
-	[ -e ${INIT_FILE} ] || install -o root -g root -m 711 init.d/freeside-init ${INIT_FILE}
+	#[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
+	perl -p -i -e "\
+	  s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
+	  s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
+	  s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
+	  s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
+	  s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
+	  s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
+	  s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
+	  s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
+	" ${INIT_FILE}
 
 install: install-perl-modules install-docs install-init
 
@@ -121,7 +159,7 @@ clean:
 
 #these are probably only useful if you're me...
 
-upload-docs:
+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