From: Jeff King <peff@peff.net>
To: Heiko Becker <heirecka@exherbo.org>
Cc: git@vger.kernel.org, drafnel@gmail.com
Subject: Re: [PATCH] gnome-keyring: Don't hard-code pkg-config executable
Date: Thu, 16 Jun 2016 05:50:01 -0400 [thread overview]
Message-ID: <20160616095001.GI15851@sigill.intra.peff.net> (raw)
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...
> 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
next prev parent reply other threads:[~2016-06-16 9:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-14 11:27 [PATCH] gnome-keyring: Don't hard-code pkg-config executable Heiko Becker
2016-06-16 9:50 ` Jeff King [this message]
2016-06-16 18:56 ` Brandon Casey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160616095001.GI15851@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=heirecka@exherbo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).