X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=b7b355c729edd99dab267eeaeae2238298a0b4a1;hb=b6e36782e425e116b976523e18825f9d6e4d18cb;hp=add0dc20aede07fe29392848690e64c1c8c18fc5;hpb=03e760a0a5f8967c4a5ae2fd990dc2ad2bab9bd8;p=freeside.git

diff --git a/Makefile b/Makefile
index add0dc20a..b7b355c72 100644
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.9.2cvs
+VERSION=1.9.2
 TAG=freeside_1_9_2
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
@@ -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:
-	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_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
+	" ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
 	rm -rf masondocs