diff options
| author | Kylie McClain <somasis@exherbo.org> | 2016-06-07 17:22:35 -0400 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-06-17 12:36:24 +0200 |
| commit | 5062fbe7ec16c4f736bca9aab68dde101d6d6163 (patch) | |
| tree | 3f9bdaa0b1a2558e265feab93a4fa9bd8492a8c1 | |
| parent | md2html: use utf-8 and flush output buffer (diff) | |
| download | cgit-pink-5062fbe7ec16c4f736bca9aab68dde101d6d6163.tar.gz cgit-pink-5062fbe7ec16c4f736bca9aab68dde101d6d6163.zip | |
cgit.mk: Use $PKG_CONFIG
PKG_CONFIG is a variable dictated by autoconf standards; it should be used if set.
| -rw-r--r-- | cgit.mk | 8 |
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 |