X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=568cf4a8844c04a2149657b850e02654c9e7d4aa;hb=f4862b07c4a7c773c90c8fe30b149db8a6da71e5;hp=34e3fdd1e26efe8fd5a9fa764718074d5eef6f24;hpb=b0cfa107afc1e75b94de0d1de3206d324a9372ef;p=freeside.git

diff --git a/Makefile b/Makefile
index 34e3fdd1e..568cf4a88 100644
--- a/Makefile
+++ b/Makefile
@@ -203,6 +203,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;\
@@ -361,12 +362,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