* [PATCH] gnome-keyring: Don't hard-code pkg-config executable
@ 2016-06-14 11:27 Heiko Becker
2016-06-16 9:50 ` Jeff King
0 siblings, 1 reply; 3+ messages in thread
From: Heiko Becker @ 2016-06-14 11:27 UTC (permalink / raw)
To: git; +Cc: drafnel, Heiko Becker
Helpful if your pkg-config executable has a prefix based on the
architecture, for example.
Signed-off-by: Heiko Becker <heirecka@exherbo.org>
---
contrib/credential/gnome-keyring/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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)
SRCS:=$(MAIN).c
OBJS:=$(SRCS:.c=.o)
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnome-keyring: Don't hard-code pkg-config executable
2016-06-14 11:27 [PATCH] gnome-keyring: Don't hard-code pkg-config executable Heiko Becker
@ 2016-06-16 9:50 ` Jeff King
2016-06-16 18:56 ` Brandon Casey
0 siblings, 1 reply; 3+ messages in thread
From: Jeff King @ 2016-06-16 9:50 UTC (permalink / raw)
To: Heiko Becker; +Cc: git, drafnel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gnome-keyring: Don't hard-code pkg-config executable
2016-06-16 9:50 ` Jeff King
@ 2016-06-16 18:56 ` Brandon Casey
0 siblings, 0 replies; 3+ messages in thread
From: Brandon Casey @ 2016-06-16 18:56 UTC (permalink / raw)
To: Jeff King; +Cc: Heiko Becker, git@vger.kernel.org
On Thu, Jun 16, 2016 at 2:50 AM, Jeff King <peff@peff.net> wrote:
> 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...
ditto.
> ...and the implementation looks obviously correct.
ditto.
> Thanks.
ditto.
See I'm still alive, really!
-Brandon
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-16 18:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-14 11:27 [PATCH] gnome-keyring: Don't hard-code pkg-config executable Heiko Becker
2016-06-16 9:50 ` Jeff King
2016-06-16 18:56 ` Brandon Casey
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).