mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cgit.mk: Use $PKG_CONFIG

Browse Source 
PKG_CONFIG is a variable dictated by autoconf standards; it should
be used if set.
This commit is contained in:
Kylie McClain 2016-06-07 17:22:35 -04:00 committed by Jason A. Donenfeld
parent 7d51120440
commit 5062fbe7ec
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cgit.mk
View File

@ -21,6 +21,8 @@ CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
PKG_CONFIG ?= pkg-config
ifdef NO_C99_FORMAT ifdef NO_C99_FORMAT
CFLAGS += -DNO_C99_FORMAT CFLAGS += -DNO_C99_FORMAT
endif endif
@ -31,7 +33,7 @@ ifdef NO_LUA
else else
ifeq ($(LUA_PKGCONFIG),) ifeq ($(LUA_PKGCONFIG),)
LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \ 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) done)
LUA_MODE := autodetected LUA_MODE := autodetected
else else
@ -39,8 +41,8 @@ else
endif endif
ifneq ($(LUA_PKGCONFIG),) ifneq ($(LUA_PKGCONFIG),)
LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG) LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
LUA_LIBS := $(shell pkg-config --libs $(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) LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null)
CGIT_LIBS += $(LUA_LIBS) CGIT_LIBS += $(LUA_LIBS)
CGIT_CFLAGS += $(LUA_CFLAGS) CGIT_CFLAGS += $(LUA_CFLAGS)
else else