aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKylie McClain <somasis@exherbo.org>2016-06-07 17:22:35 -0400
committerJason A. Donenfeld <Jason@zx2c4.com>2016-06-17 12:36:24 +0200
commit5062fbe7ec16c4f736bca9aab68dde101d6d6163 (patch)
tree3f9bdaa0b1a2558e265feab93a4fa9bd8492a8c1
parent7d51120440346108aad74f007431ad65b307f6d7 (diff)
downloadcgit-5062fbe7ec16c4f736bca9aab68dde101d6d6163.tar.gz
cgit.mk: Use $PKG_CONFIG
PKG_CONFIG is a variable dictated by autoconf standards; it should be used if set.
-rw-r--r--cgit.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/cgit.mk b/cgit.mk
index 1b50307..369f309 100644
--- a/cgit.mk
+++ b/cgit.mk
@@ -21,6 +21,8 @@ CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
+PKG_CONFIG ?= pkg-config
+
ifdef NO_C99_FORMAT
CFLAGS += -DNO_C99_FORMAT
endif
@@ -31,7 +33,7 @@ ifdef NO_LUA
else
ifeq ($(LUA_PKGCONFIG),)
LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
- pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \
+ $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \
done)
LUA_MODE := autodetected
else
@@ -39,8 +41,8 @@ else
endif
ifneq ($(LUA_PKGCONFIG),)
LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
- LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null)
- LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null)
+ LUA_LIBS := $(shell $(PKG_CONFIG) --libs $(LUA_PKGCONFIG) 2>/dev/null)
+ LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null)
CGIT_LIBS += $(LUA_LIBS)
CGIT_CFLAGS += $(LUA_CFLAGS)
else