X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=3486b79679227a9a8a4df267618bc529875d0992;hp=2976e74ab0e2e29922735a9c6e0449795f3904ff;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hpb=1d082266d05d60687671c2dee41442a3af16cf94

diff --git a/Makefile b/Makefile
index 2976e74ab..3486b7967 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
-TORRUS_ENABLED = 1
+#TORRUS_ENABLED = 1
 
 # for auto-version updates, so we can "make release" more things automatically
 RPM_SPECFILE = rpm/freeside.spec
@@ -195,6 +195,8 @@ install-docs: docs
 	mkdir -p ${FREESIDE_EXPORT}/profile
 	chown freeside ${FREESIDE_EXPORT}/profile
 	rm -rf ${MASONDATA}/*
+	mkdir ${MASONDATA}/cache || true
+	mkdir ${MASONDATA}/obj || true
 	chown -f -R freeside ${MASONDATA} || true
 
 dev-docs:
@@ -215,6 +217,7 @@ perl-modules:
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	  s'%%%RT_PATH%%%'${RT_PATH}'g; \
@@ -233,7 +236,7 @@ perl-modules:
 	" blib/lib/FS/part_export/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
-	" blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
+	" blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm blib/lib/FS/contact/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	" blib/lib/FS/Daemon/*.pm;\