devel/common Makefile.common,1.36,1.37

[Mike McGrath]

On 10/16/06, Mike McGrath <mmcgrath at fedoraproject.org> wrote:
> On 10/16/06, Adrian Reber <adrian at lisas.de> wrote:
> > On Sun, Oct 15, 2006 at 03:00:32PM -0700, Jeremy Katz wrote:
> > > Index: Makefile.common
> > > ===================================================================
> > > RCS file: /cvs/extras/devel/common/Makefile.common,v
> > > retrieving revision 1.36
> > > retrieving revision 1.37
> > > diff -u -r1.36 -r1.37
> > > --- Makefile.common   12 Jun 2006 15:59:26 -0000      1.36
> > > +++ Makefile.common   15 Oct 2006 22:00:32 -0000      1.37
> > > @@ -88,7 +88,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
> > > +PLAGUE_CLIENT ?= $(which plague-client)
> >
> > This breaks "make build" for me:
> >
> > $ make build
> > build ibmonitor ibmonitor-1_4-1 devel
> > make: build: Command not found
> > make: *** [build] Error 127
> >
> > If I use "PLAGUE_CLIENT=/usr/bin/plague-client make build" it still works.
> >
> >                 Adrian
> >
>
> This patch should fix it.
>

oops, actually this:

--- Makefile.common.orig        2006-10-16 09:15:42.000000000 -0500
+++ Makefile.common     2006-10-16 09:14:55.000000000 -0500
@@ -89,7 +89,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 ?= $(which plague-client)
+PLAGUE_CLIENT ?= $(shell which plague-client)

 # RPM with all the overrides in place; you can override this in your
 # .cvsextrasrc also, to use a default rpm setup