From 6a0ab60447ea0e215296586f0cef673be2fe9537 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Sat, 7 Feb 2004 18:50:26 +0000 Subject: Fix for pserver return code on update --- Makefile.devel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.devel b/Makefile.devel index 14ef5573..c3d8d039 100644 --- a/Makefile.devel +++ b/Makefile.devel @@ -326,10 +326,10 @@ images: FORCE ## tag: @echo "*************************************************" - @echo " Tagging sources... (rerun if CVS source dirty)" + @echo " Tagging sources... (you must rerun if CVS source dirty)" @echo "*************************************************" # Update the sources, this is almost always what we want to do. - if [ -z "$(NOCVS)" ] && [ -n "`cvs -n -q update -P`" ]; then cvs update -Pd; exit 1; fi + if [ -z "$(NOCVS)" ] && [ -n "`cvs -n -q update -P | grep '^[MC] '`" ]; then cvs update -Pd; exit 1; fi # Tag proof-site.el and ProofGeneral.spec (cd generic; mv $(VERSIONFILE) $(VERSIONFILE).old; sed -e 's/defconst $(VERSIONVARIABLE) \".*\"/defconst $(VERSIONVARIABLE) \"Proof General Version $(FULLVERSION). Released by da$(DATEMSG).\"/g' $(VERSIONFILE).old > $(VERSIONFILE); rm $(VERSIONFILE).old) (cd etc; mv ProofGeneral.spec ProofGeneral.spec.old; sed -e 's/Version:.*$$/Version: $(VERSION)/g' ProofGeneral.spec.old > ProofGeneral.spec; rm ProofGeneral.spec.old) -- cgit v1.2.3