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

diff --git a/Makefile b/Makefile
index 2f696dc21..bf3f3d7a1 100644
--- a/Makefile
+++ b/Makefile
@@ -121,10 +121,10 @@ RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/
 
-VERSION=2.1.0cvs
-TAG=freeside_2_1_0
+VERSION=2.1.1cvs
+TAG=freeside_2_1_1
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -149,7 +149,7 @@ help:
 	@echo "                   wikiman"
 	@echo "                   perl-modules"
 	#@echo
-	#@echo "                   upload-docs release update-webdemo"
+	#@echo "                   upload-docs release"
 
 
 masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
@@ -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;\
@@ -311,7 +312,7 @@ create-config: install-perl-modules
 	chown freeside ${FREESIDE_CONF}/secrets
 	chmod 600 ${FREESIDE_CONF}/secrets
 
-	echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+	/bin/echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
 	chmod 600 ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
 
@@ -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
@@ -403,6 +404,10 @@ release:
 	dch -v ${DEBVERSION} -p "New upstream release"
 	cvs commit -m "Updated for ${VERSION}" debian/changelog
 
+	# Make sure other people's changes are pulled in!
+	cvs update -d -P || true #it exits 1...
+
+	# Tag the release
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -426,8 +431,3 @@ release:
 
 	#update web demo self-service?
 
-update-webdemo:
-	ssh ivan@420.am '( cd freeside; cvs update -d -P )'
-	#ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'
-	ssh root@420.am '( cd /home/ivan/freeside; make deploy )'
-