about summary refs log tree commit diff stats
path: root/cgit.mk
diff options
context:
space:
mode:
authorKylie McClain2016-06-07 17:22:35 -0400
committerJason A. Donenfeld2016-06-17 12:36:24 +0200
commit5062fbe7ec16c4f736bca9aab68dde101d6d6163 (patch)
tree3f9bdaa0b1a2558e265feab93a4fa9bd8492a8c1 /cgit.mk
parentmd2html: use utf-8 and flush output buffer (diff)
downloadcgit-5062fbe7ec16c4f736bca9aab68dde101d6d6163.tar.gz
cgit-5062fbe7ec16c4f736bca9aab68dde101d6d6163.zip
cgit.mk: Use $PKG_CONFIG
PKG_CONFIG is a variable dictated by autoconf standards; it should
be used if set.
Diffstat (limited to 'cgit.mk')
-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)"'
21CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 21CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
22CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 22CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
23 23
24PKG_CONFIG ?= pkg-config
25
24ifdef NO_C99_FORMAT 26ifdef NO_C99_FORMAT
25 CFLAGS += -DNO_C99_FORMAT 27 CFLAGS += -DNO_C99_FORMAT
26endif 28endif
@@ -31,7 +33,7 @@ ifdef NO_LUA
31else 33else
32ifeq ($(LUA_PKGCONFIG),) 34ifeq ($(LUA_PKGCONFIG),)
33 LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \ 35 LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
34 pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \ 36 $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \
35 done) 37 done)
36 LUA_MODE := autodetected 38 LUA_MODE := autodetected
37else 39else
@@ -39,8 +41,8 @@ else
39endif 41endif
40ifneq ($(LUA_PKGCONFIG),) 42ifneq ($(LUA_PKGCONFIG),)
41 LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG) 43 LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
42 LUA_LIBS := $(shell pkg-config --libs $(LUA_PKGCONFIG) 2>/dev/null) 44 LUA_LIBS := $(shell $(PKG_CONFIG) --libs $(LUA_PKGCONFIG) 2>/dev/null)
43 LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKGCONFIG) 2>/dev/null) 45 LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null)
44 CGIT_LIBS += $(LUA_LIBS) 46 CGIT_LIBS += $(LUA_LIBS)
45 CGIT_CFLAGS += $(LUA_CFLAGS) 47 CGIT_CFLAGS += $(LUA_CFLAGS)
46else 48else