X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=71fb13e587d80df1e6157f2e7351878a690801a0;hb=81bf444ccd0787b8e1bd09cddcd94fbc9378aa93;hp=2e8fd1f2dc60444373a649ba4b90f60b589429ed;hpb=0ff607900727da25755f08101f557eeb469fe2bd;p=freeside.git

diff --git a/Makefile b/Makefile
index 2e8fd1f2d..71fb13e58 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ TEMPLATE = asp
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 
+HTTPD_RESTART = /etc/init.d/apache restart
+QUEUED_RESTART = /etc/init.d/freeside restart
+
 #---
 
 #not changable yet
@@ -58,10 +61,11 @@ install-perl-modules: perl-modules
 install: install-perl-modules install-docs
 
 deploy: install
-	/etc/init.d/apache restart
+	${HTTPD_RESTART}
+	${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`