Re: [PATCH] gnome-keyring: Don't hard-code pkg-config executable

From: Jeff King <peff@peff.net>
Date: Jun 16, 2016, 09:50 UTC
Message-ID: <20160616095001.GI15851@sigill.intra.peff.net>
In-Reply-To: <20160614112705.7162-1-heirecka@exherbo.org>

On Tue, Jun 14, 2016 at 01:27:05PM +0200, Heiko Becker wrote:

> Helpful if your pkg-config executable has a prefix based on the
> architecture, for example.
> 
> Signed-off-by: Heiko Becker <heirecka@exherbo.org>

Sounds like a reasonable thing to want to do...

Show 17 quoted lines

> diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile
> index c3c7c98..22c19df 100644
> --- a/contrib/credential/gnome-keyring/Makefile
> +++ b/contrib/credential/gnome-keyring/Makefile
> @@ -4,12 +4,13 @@ all:: $(MAIN)
>  CC = gcc
>  RM = rm -f
>  CFLAGS = -g -O2 -Wall
> +PKG_CONFIG = pkg-config
>  
>  -include ../../../config.mak.autogen
>  -include ../../../config.mak
>  
> -INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
> -LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
> +INCS:=$(shell $(PKG_CONFIG) --cflags gnome-keyring-1 glib-2.0)
> +LIBS:=$(shell $(PKG_CONFIG) --libs gnome-keyring-1 glib-2.0)

...and the implementation looks obviously correct.

Thanks.

-Peff