X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=8bfc56aa09e2df260f448096a642cd735de46382;hb=d0221fabd4656b3a04251ca6168cc45f54d23574;hp=6d0b2c009108667300b1a00b5f488735df8c7a70;hpb=8d6987f81d3d5667b00b428580a05e7ac973279a;p=freeside.git

diff --git a/Makefile b/Makefile
index 6d0b2c009..8bfc56aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -171,6 +171,7 @@ install-docs: docs
 	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
 	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
 	cp htetc/handler.pl ${MASON_HANDLER}
+	cp htetc/htpasswd.logout ${FREESIDE_CONF}
 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	chown -R freeside ${MASONDATA}
 
@@ -203,6 +204,7 @@ perl-modules:
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
 	" blib/lib/FS/Cron/*.pm;\
 	perl -p -i -e "\
+	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
 	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	" blib/lib/FS/part_export/*.pm;\
@@ -354,11 +356,14 @@ create-rt: configure-rt
 	[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
 	cd rt; make install
 	rt/sbin/rt-setup-database --dba '${DB_USER}' \
-	                          -dba-password '${DB_PASSWORD}' \
-	                          -action schema \
+	                          --dba-password '${DB_PASSWORD}' \
+	                          --action schema \
 	 || true
-	rt/sbin/rt-setup-database --action insert_initial \
-	&& rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
+	rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+	                          --action coredata \
+	&& rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+	                             --action insert \
+	                             --datafile ${RT_PATH}/etc/initialdata \
 	|| true
 
 install-rt: