X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=e5ef70d6c0b482ef34649d4d6a1a6c2d18d4b608;hp=7f06cb7ef07f74fd1e3cb61a896110d298be464b;hb=e5f676566d9fd2dd61d5e48c26ccd9f4387f8cc8;hpb=0bfec9596615f85454378af865677e49f0a4f68d

diff --git a/Makefile b/Makefile
index 7f06cb7ef..e5ef70d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -189,9 +189,9 @@ configure-rt:
 	cp config.layout.in config.layout; \
 	perl -p -i -e "\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
-	" config.layout
+	  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: