X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=c42cc5ed47ba00f7f9362a523ca7045693a4868d;hb=97a2e9230fddd590304b7a16b3da1d14aa7411d3;hp=b7b355c729edd99dab267eeaeae2238298a0b4a1;hpb=f9468f981a8b993d40ea6a11d826ae4c358fbe23;p=freeside.git

diff --git a/Makefile b/Makefile
index b7b355c72..c42cc5ed4 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=1.9.2
-TAG=freeside_1_9_2
+VERSION=1.9.4cvs
+TAG=freeside_1_9_4
 
 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/*/*/*/*
@@ -311,7 +311,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
 
@@ -399,6 +399,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
+
+	# Tag the release
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -422,8 +426,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 )'
-