commit: ba0a11fc94d303e208dd364b06c1c2a75bcdd62b
Author: Johan Bergström <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Wed Oct 22 22:59:57 2014 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 18:04:20 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ba0a11fc
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 6f590da..2d6ad01 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
