X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=aca452fd3f1361dcede90d935f59d703185c2a0e;hb=c86fe9ea75d23d3d0c3536b709ac1e086f15a5de;hp=2f696dc2145bc6e34f854b94a613f2327cab4693;hpb=904132fd7c5e470b26fd9a2b1cbc4ff1ba114c66;p=freeside.git

diff --git a/Makefile b/Makefile
index 2f696dc21..aca452fd3 100644
--- a/Makefile
+++ b/Makefile
@@ -204,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;\
@@ -366,12 +367,12 @@ create-rt: configure-rt
 	|| true
 
 install-rt:
-	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-	[ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
+	if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+	if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
 	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
 	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-	" ${RT_PATH}/etc/RT_SiteConfig.pm
+	" ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
 	rm -rf masondocs