common Makefile.common,1.34,1.35

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	Makefile.common 
Log Message:
patch from enrico to allow the use of alternative plague client binary



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.common	14 Oct 2005 18:26:06 -0000	1.34
+++ Makefile.common	16 Dec 2005 16:57:12 -0000	1.35
@@ -81,6 +81,7 @@
 CURL	?= $(shell if test -f /usr/bin/curl ; then echo "curl -H Pragma: -O -R -S --fail --show-error" ; fi)
 WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
 CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
+PLAGUE_CLIENT ?= /usr/bin/plague-client
 
 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup
@@ -330,12 +331,12 @@
 	popd >/dev/null)
 
 build plague: $(COMMON_DIR)/branches
-	@if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
+	@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
 
 	@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
-	/usr/bin/plague-client build $(NAME) $(TAG) $(TARGET)
+	$(PLAGUE_CLIENT) build $(NAME) $(TAG) $(TARGET)
 
 
 # "make new | less" to see what has changed since the last tag was assigned