X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=1211232874b1a8cf31904921c79a122e8f8177a6;hb=1d1703a3c1217c744d2393cbef19364fd595bcb0;hp=677dea933ba10ff9ae0a767382149e7f81ba37be;hpb=33e4caaea5d17c9f39d8d006864f08c0e565db47;p=freeside.git

diff --git a/Makefile b/Makefile
index 677dea933..121123287 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ TEMPLATE = asp
 #mason's a bit dodgy still
 #TEMPLATE = mason
 
+ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
 HTTPD_RESTART = /etc/init.d/apache restart
@@ -46,8 +48,11 @@ docs:
 	make ${TEMPLATE}docs
 
 install-docs: docs
-	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`
+	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+	[ "${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
 
 perl-modules:
 	cd FS; \
@@ -65,10 +70,10 @@ deploy: install
 	${QUEUED_RESTART}
 
 create-database:
-	perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;'
+	perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
 create-config: install-perl-modules
-	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S`
+	[ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
 	mkdir ${FREESIDE_CONF}
 	chown freeside ${FREESIDE_CONF}