X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=e5ef70d6c0b482ef34649d4d6a1a6c2d18d4b608;hp=dd55046a7697145bf2b9fd8b47770f014bc78050;hb=0f10241a8a2e3d5978b17f7b3b0c579902ae2250;hpb=503094650e95d616b467c51e96ec70be0bd79e57

diff --git a/Makefile b/Makefile
index dd55046a7..e5ef70d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -187,11 +187,11 @@ create-config: install-perl-modules
 configure-rt:
 	cd rt; \
 	cp config.layout.in config.layout; \
-	perl -p -i -e \"
-	  s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;\
-	" config.layout
+	perl -p -i -e "\
+	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
+	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
+	" config.layout; \
 	./configure --with-layout=Freeside\
-	            --masonstatedir=${MASONDATA} \
 	            --with-db-type=Pg \
 	            --with-db-database=freeside \
 	            --with-db-rt-user=${DB_USER} \
@@ -201,9 +201,9 @@ configure-rt:
 
 create-rt: configure-rt
 	cd rt; make install
-	rt/sbin/rt-initialize-database --action schema
-	rt/sbin/rt-initialize-database --action insert_initial
-	rt/sbin/rt-initialize-database --action insert --datafile rt/etc/initialdata
+	rt/sbin/rt-setup-database --action schema
+	rt/sbin/rt-setup-database --action insert_initial
+	rt/sbin/rt-setup-database --action insert --datafile rt/etc/initialdata
 
 
 clean: