[freeside-commits] freeside Makefile,1.187,1.188

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv17194

Modified Files:
	Makefile 
Log Message:
ensure that the trainwreck which was 1.9.2 does not happen again

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -w -d -r1.187 -r1.188
--- Makefile	1 Mar 2010 19:10:52 -0000	1.187
+++ Makefile	21 Apr 2010 03:56:56 -0000	1.188
@@ -149,7 +149,7 @@
 	@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 @@
 	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 @@
 
 	#update web demo self-service?
 
-update-webdemo:
-	ssh ivan at 420.am '( cd freeside; cvs update -d -P )'
-	#ssh root at 420.am '( cd /home/ivan/freeside; make clean; make deploy )'
-	ssh root at 420.am '( cd /home/ivan/freeside; make deploy )'
-