summaryrefslogtreecommitdiffstats
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-15 14:37:52 +0000
committerian <ian@FreeBSD.org>2014-05-15 14:37:52 +0000
commit99db57bb75cc9c4ea5cc30cfba3f9cb00b85162c (patch)
tree7021b295bb882c0f95fbe804236e4bc57ce7287f /usr.bin/Makefile
parent27f0a13f0adbfdb658bb63aac86772e0107c1c20 (diff)
downloadFreeBSD-src-99db57bb75cc9c4ea5cc30cfba3f9cb00b85162c.zip
FreeBSD-src-99db57bb75cc9c4ea5cc30cfba3f9cb00b85162c.tar.gz
MFC r261215, r261257
Merge from vendor branch importing dtc git rev 6a15eb2350426d285130e4c9d84c0bdb6575547a Don't build BSDL dtc if the GPL dtc is enabled.
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index be3f95b..c6727cd 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -37,7 +37,6 @@ SUBDIR= alias \
ctlstat \
cut \
dirname \
- dtc \
du \
ee \
elf2aout \
@@ -231,6 +230,10 @@ SUBDIR+= calendar
_clang= clang
.endif
+.if ${MK_GPL_DTC} != "yes"
+SUBDIR+= dtc
+.endif
+
.if ${MK_GROFF} != "no"
SUBDIR+= vgrind
.endif
OpenPOWER on IntegriCloud