diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 13:06:40 -0700 |
| commit | 1729853432011faa51a88ab9831dc9b382a6ee7e (patch) | |
| tree | 4071ddc4d4bf5c788445e1db17fb72249871044b /contrib | |
| parent | c8b080af7108744299e26e8d38cb6587b933f9fc (diff) | |
| parent | 3cddb008c15978ae81ff144e24303467076d200f (diff) | |
| download | git-1729853432011faa51a88ab9831dc9b382a6ee7e.tar.gz git-1729853432011faa51a88ab9831dc9b382a6ee7e.tar.xz | |
Merge branch 'nb/gnome-keyring-build' into maint
Build improvements for gnome-keyring (in contrib/)
* nb/gnome-keyring-build:
gnome-keyring: Don't hard-code pkg-config executable
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/credential/gnome-keyring/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile index c3c7c98aa..22c19df94 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) |