common Makefile.common,1.46,1.47

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8920

Modified Files:
	Makefile.common 
Log Message:
Make 'make build' dtrt depending on the branch.  (Christian Iseli / Michael Schwendt)



Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.common	3 May 2007 03:58:18 -0000	1.46
+++ Makefile.common	3 May 2007 15:40:19 -0000	1.47
@@ -345,7 +345,7 @@
 	cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
 	popd >/dev/null)
 
-build plague: $(COMMON_DIR)/branches
+plague: $(COMMON_DIR)/branches
 	@if [ ! -x $(PLAGUE_CLIENT) ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
 	@if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi
 
@@ -359,9 +359,17 @@
 
 	@cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\
 	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
-	
+
 	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(TARGET) 'cvs://cvs.fedoraproject.org/cvs/extras?$(CVS_REPOSITORY)#$(TAG)'
 
+# build selects koji for devel and plague for the rest
+build: $(COMMON_DIR)/branches
+	@if [ "x$(BRANCH)" = "xdevel" ]; then \
+	  $(MAKE) koji ; \
+	else \
+	  $(MAKE) plague ; \
+	fi
+
 # "make new | less" to see what has changed since the last tag was assigned
 new:
 	- at cvs diff -u -r$$(cvs log Makefile 2>/dev/null | awk '/^symbolic names:$$/ {getline; sub(/^[ \t]*/, "") ; sub (/:.*$$/, ""); print; exit 0}')