On Tue, Jun 7, 2016 at 5:22 PM, Kylie McClain <[email protected]> wrote: > From: Kylie McClain <[email protected]> > > PKG_CONFIG is a variable dictated by autoconf standards; it should > be used if set. > --- > cgit.mk | 8 +++++--- > 1 file 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 > -- > 2.8.3 >
ping? _______________________________________________ CGit mailing list [email protected] http://lists.zx2c4.com/mailman/listinfo/cgit
