common Makefile.common,1.88,1.89

[Bill Nottingham (notting)]

Author: notting

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

Modified Files:
	Makefile.common 
Log Message:
Don't eat KOJI_FLAGS, show some useful info. (<ville.skytta at iki.fi>, infra #450)



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.common	3 Mar 2008 14:45:26 -0000	1.88
+++ Makefile.common	17 Mar 2008 15:56:50 -0000	1.89
@@ -32,7 +32,7 @@
 DISTVAL = $(word 4, $(BRANCHINFO))
 DIST_DEFINES = --define "dist $(DIST)" --define "$(DISTVAR) $(DISTVAL)"
 
-BUILD_FLAGS ?=  $(shell echo $(KOJI_FLAGS))
+BUILD_FLAGS ?= $(KOJI_FLAGS)
 
 
 ## a base directory where we'll put as much temporary working stuff as we can
@@ -423,7 +423,7 @@
 
 koji: build-check $(COMMON_DIR)/branches
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
-	@$(BUILD_CLIENT) $(SECONDARY_CONFIG) build $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
+	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
 ifneq (, $(filter devel F-9 F-8 F-7 OLPC-2, $(BRANCH)))
 build: koji
@@ -433,12 +433,12 @@
 
 scratch-build: build-check
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
-	@$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
+	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
 
 scratch-build-%: build-check
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
-	@$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch --arch-override=$* $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
+	$(BUILD_CLIENT) $(SECONDARY_CONFIG) build --scratch --arch-override=$* $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
 
 bodhi: build-check $(COMMON_DIR)/branches clog