javascript confirm when slaving a domain

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 42f1b85..e5ef70d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -188,10 +188,10 @@ configure-rt:
        cd rt; \
        cp config.layout.in config.layout; \
        perl -p -i -e "\
-         s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;\
-       " config.layout
+         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: