X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=6d3d80397ce3e8907e19dd3940c345feb9511973;hp=8a9921040cc41b5d170ce1f194c33ba3a942d74d;hb=c28a1f2d8b6c0c355a96f3b8f34c2ec40971c2a1;hpb=4c4b4f8d7548e10b98a173de30e25174f7cd305a

diff --git a/Makefile b/Makefile
index 8a9921040..6d3d80397 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat, mandrake
+#redhat, fedora, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
@@ -24,14 +24,14 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #suse
 #FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat, mandrake
+#redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
@@ -40,7 +40,7 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
@@ -59,8 +59,8 @@ SELFSERVICE_MACHINES = localhost
 RT_ENABLED = 0
 #RT_ENABLED = 1
 RT_DOMAIN = example.com
-RT_TIMEZONE = 'US/Pacific';
-#RT_TIMEZONE = 'US/Eastern';
+RT_TIMEZONE = US/Pacific;
+#RT_TIMEZONE = US/Eastern;
 
 #---
 
@@ -129,6 +129,10 @@ 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}" = "asp" ] && \
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	  " ${ASP_GLOBAL}/global.asa || true
 	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
@@ -213,7 +217,7 @@ configure-rt:
 create-rt: configure-rt
 	cd rt; make install
 	echo -e "${DB_PASSWORD}\n\\d sessions"\
-	 | psql -UW ${DB_USER} freeside 2>&1\
+	 | psql -U ${DB_USER} -W freeside 2>&1\
 	 | grep '^Did not find'\
 	 && rt/sbin/rt-setup-database --dba '${DB_USER}' \
 	                             --dba-password '${DB_PASSWORD}' \
@@ -228,7 +232,7 @@ create-rt: configure-rt
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
 install-rt:
-	[ ${RT_ENABLED} ] && cd rt; make install
+	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
 	rm -rf aspdocs masondocs