X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=f6f7ae516835dd74eedca7d394fde5289d4bbf60;hb=0fd798c8ecec0141cdb4c5db2016a94ae34a24f2;hp=0d99e136193102f800be4080de8dd13aa719d347;hpb=95558fc7bcc98138db7f2d54cd5e6724bac3beea;p=freeside.git

diff --git a/Makefile b/Makefile
index 0d99e1361..f6f7ae516 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,15 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
+#suse
+#FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
 
-#deb, redhat, mandrake, others?
+#deb, redhat, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
-#deb
+#deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
@@ -38,7 +40,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, others?
+#deb, redhat, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
@@ -52,7 +54,7 @@ FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
 SELFSERVICE_MACHINES = localhost
-# SELFSERVICE_MACHINES = "web1.example.com web2.example.com"
+# SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
 #---
 
@@ -119,6 +121,10 @@ install-docs: docs
 	[ "${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" ] &&
+	  perl -p -i -e "\
+	    s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g; \
+	  " ${MASON_HANDLER}
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
@@ -152,8 +158,7 @@ create-database:
 
 create-config: install-perl-modules
 	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
-	mkdir ${FREESIDE_CONF}
-	chown freeside ${FREESIDE_CONF}
+	install -d -o freeside ${FREESIDE_CONF}
 
 	touch ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
@@ -186,8 +191,8 @@ 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 pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
+	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/devdocs
 
 release: upload-docs
 	cd /home/ivan/freeside
@@ -198,7 +203,7 @@ release: upload-docs
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-	scp freeside-${VERSION}.tar.gz ivan@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+	scp freeside-${VERSION}.tar.gz ivan@pouncequick.420.am:/var/www/sisd.420.am/freeside/
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo: