From 52016d32bc40fe0ac6a8886e31b48169810efaad Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 3 Feb 2018 12:41:00 +1100 Subject: [PATCH] Makefile: Only check for pkg-config when on a system that uses it This fixes compilation on OSX where pkg-config is not installed by default. --- src/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Makefile b/src/Makefile index 3a115c295..f315d007e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -54,6 +54,10 @@ else ifneq (,$(findstring CYGWIN,$(os))) CPPFLAGS += -D_XOPEN_SOURCE=700 LIBS += -lncursesw -ldbghelp else + ifeq ($(PKG_CONFIG),) + $(error "pkg-config not found in PATH") + endif + LIBS += $(shell $(PKG_CONFIG) --libs ncursesw) CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncursesw) LDFLAGS += -rdynamic @@ -66,12 +70,7 @@ endif CXXFLAGS += -pedantic -std=gnu++14 -g -Wall -Wextra -Wno-unused-parameter -Wno-reorder -Wno-sign-compare -Wno-address -Wno-noexcept-type -Wno-unknown-attributes -Wno-unknown-warning-option -all : check_pkg_config kak - -check_pkg_config: -ifeq ($(PKG_CONFIG),) - $(error "pkg-config not found in PATH") -endif +all : kak kak : kak$(suffix) ln -sf $< $@