X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=bba2d7918cededa4f7bafda2d93b6e3fc3942d5c;hp=aca452fd3f1361dcede90d935f59d703185c2a0e;hb=e5aef8203d5e01873246eeecf67f3c214ea79220;hpb=87310e447eba1cf399ea6f5ac980e6dfdaa7a6e3

diff --git a/Makefile b/Makefile
index aca452fd3..bba2d7918 100644
--- a/Makefile
+++ b/Makefile
@@ -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/*/*/*/*
@@ -404,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
+
+	# Tag the release
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -427,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 )'
-