summaryrefslogtreecommitdiff
path: root/term-utils/Makemodule.am
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-06-12 12:04:01 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2014-06-12 12:04:01 +0100
commitc5c1033c5c7deda8abe3448ec81bbb33c72219e0 (patch)
tree6e5cef29b85161eea8a7488a029f5a32f982c6ab /term-utils/Makemodule.am
parent462008f79be9e195670b202cb43827b8aeb1e60b (diff)
parent2fb567c080e1762ec6a2147564f03068f55d4f14 (diff)
downloadutil-linux-baserock/morph.tar.gz
Merge branch 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius Reviewed-by: Sam Thursfield
Diffstat (limited to 'term-utils/Makemodule.am')
-rw-r--r--term-utils/Makemodule.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index 470987344..e53471f23 100644
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -28,10 +28,14 @@ if BUILD_SETTERM
usrbin_exec_PROGRAMS += setterm
dist_man_MANS += term-utils/setterm.1
setterm_SOURCES = term-utils/setterm.c
+setterm_CFLAGS = $(AM_CFLAGS)
+setterm_LDADD = $(LDADD)
if HAVE_TINFO
-setterm_LDADD = $(LDADD) -ltinfo
+setterm_LDADD += $(TINFO_LIBS)
+setterm_CFLAGS += $(TINFO_CFLAGS)
else
-setterm_LDADD = $(LDADD) @NCURSES_LIBS@
+setterm_LDADD += $(NCURSES_LIBS)
+setterm_CFLAGS += $(NCURSES_CFLAGS)
endif
endif