From ba0a11fc94d303e208dd364b06c1c2a75bcdd62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Thu, 23 Oct 2014 09:59:57 +1100 Subject: [PATCH] Pass ncurses cflags to build Fixes #25 Note from William Hubbs: The original patch overwrote CFLAGS. I modified this patch to add the ncurses cflags to CPPFLAGS instead of overwriting CFLAGS. --- mk/termcap.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/termcap.mk b/mk/termcap.mk index 6f590da6..2d6ad01b 100644 --- a/mk/termcap.mk +++ b/mk/termcap.mk @@ -1,11 +1,12 @@ ifeq (${MKTERMCAP},ncurses) - LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) +TERMCAP_CFLAGS:= $(shell pkg-config ncurses --cflags 2> /dev/null) +LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) ifeq ($(LTERMCAP),) LIBTERMCAP?= -lncurses else LIBTERMCAP?= $(LTERMCAP) endif -CPPFLAGS+= -DHAVE_TERMCAP +CPPFLAGS+= -DHAVE_TERMCAP ${TERMCAP_CFLAGS} LDADD+= ${LIBTERMCAP} else ifeq (${MKTERMCAP},termcap) LIBTERMCAP?= -ltermcap