diff options
| author | Kylie McClain | 2016-06-07 17:22:35 -0400 |
|---|---|---|
| committer | Jason A. Donenfeld | 2016-06-17 12:36:24 +0200 |
| commit | 5062fbe7ec16c4f736bca9aab68dde101d6d6163 (patch) | |
| tree | 3f9bdaa0b1a2558e265feab93a4fa9bd8492a8c1 | |
| parent | 7d51120440346108aad74f007431ad65b307f6d7 (diff) | |
| download | cgit-5062fbe7ec16c4f736bca9aab68dde101d6d6163.tar.gz cgit-5062fbe7ec16c4f736bca9aab68dde101d6d6163.tar.bz2 cgit-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
| @@ -21,6 +21,8 @@ CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | |||
| 21 | CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 21 | CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
| 22 | CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 22 | CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
| 23 | 23 | ||
| 24 | PKG_CONFIG ?= pkg-config | ||
| 25 | |||
| 24 | ifdef NO_C99_FORMAT | 26 | ifdef NO_C99_FORMAT |
| 25 | CFLAGS += -DNO_C99_FORMAT | 27 | CFLAGS += -DNO_C99_FORMAT |
| 26 | endif | 28 | endif |
| @@ -31,7 +33,7 @@ ifdef NO_LUA | |||
| 31 | else | 33 | else |
| 32 | ifeq ($(LUA_PKGCONFIG),) | 34 | ifeq ($(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 |
| 37 | else | 39 | else |
| @@ -39,8 +41,8 @@ else | |||
| 39 | endif | 41 | endif |
| 40 | ifneq ($(LUA_PKGCONFIG),) | 42 | ifneq ($(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) |
| 46 | else | 48 | else |
