X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=568cf4a8844c04a2149657b850e02654c9e7d4aa;hb=5a1e3e106a2a8ed738c1b39bb6e6445e9993088e;hp=ee75ea4cf8931a0532e8bba6f0ffac151b4e204e;hpb=325af2363cc1ebbc8479342c4e97eb2a59b05aa4;p=freeside.git

diff --git a/Makefile b/Makefile
index ee75ea4cf..568cf4a88 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.9.1
-TAG=freeside_1_9_1
+VERSION=1.9.2cvs
+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;\
@@ -314,12 +315,6 @@ create-config: install-perl-modules
 	chmod 600 ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
 
-	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	rm -rf conf/registries #old dirs just won't go away
-	#cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
 	mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
@@ -333,7 +328,8 @@ create-config: install-perl-modules
 	install -d $(DIST_CONF)
 	#install conf/[a-z]* $(DEFAULT_CONF)
 	#CVS is not [a-z]
-	install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF)
+	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
+
 
 configure-rt:
 	cd rt; \
@@ -366,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
@@ -389,7 +385,7 @@ clean:
 .PHONY: release
 release:
 	# Update the changelog
-	./CVS2CL
+	./bin/cvs2cl
 	cvs commit -m "Updated for ${VERSION}" ChangeLog
 
 	# Update the RPM specfile