common Makefile.common,1.13,1.14

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Tue May 10 03:37:48 UTC 2005


Author: notting

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10316

Modified Files:
	Makefile.common 
Log Message:
remove tobuild before updating... avoids CVS conflicts



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.common	9 May 2005 21:14:17 -0000	1.13
+++ Makefile.common	10 May 2005 03:37:46 -0000	1.14
@@ -303,6 +303,7 @@
 build:   $(COMMON_DIR)/branches
 	@if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi
 	@(pushd $(COMMON_DIR) >/dev/null ;\
+	rm -f tobuild ;\
 	cvs -Q update ;\
 	echo -e "$(USER)\t$(CVS_REPOSITORY)\t$(TAG)\t$(TARGET)" >> tobuild ;\
 	cvs commit -m"request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\




More information about the fedora-extras-commits mailing list