parsing: ban strncpy()

[cgit.git] / cgit.mk

diff --git a/cgit.mk b/cgit.mk
index 1b5030785897839477dfc750a0c1a2cb5f55b058..3fcc1ca3144038859b57a88446e7af9b2abf9260 100644 (file)
--- 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
@@ -51,8 +53,8 @@ endif
 
 endif
 
-# Add -ldl to linker flags on non-BSD systems.
-ifeq ($(findstring BSD,$(uname_S)),)
+# Add -ldl to linker flags on systems that commonly use GNU libc.
+ifneq (,$(filter $(uname_S),Linux GNU GNU/kFreeBSD))
        CGIT_LIBS += -ldl
 endif
 
@@ -75,6 +77,7 @@ CGIT_OBJ_NAMES += parsing.o
 CGIT_OBJ_NAMES += scan-tree.o
 CGIT_OBJ_NAMES += shared.o
 CGIT_OBJ_NAMES += ui-atom.o
+CGIT_OBJ_NAMES += ui-blame.o
 CGIT_OBJ_NAMES += ui-blob.o
 CGIT_OBJ_NAMES += ui-clone.o
 CGIT_OBJ_NAMES += ui-commit.o