summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2016-04-21 13:14:55 +0000
committeremaste <emaste@FreeBSD.org>2016-04-21 13:14:55 +0000
commit7fe296241e55d157f19280be5c203a147d931d5b (patch)
treeaf661f33bbad533020281ee71795ef6503eec7f0 /Makefile.inc1
parent55c6dd387976111bbcfd088fe769dafa767021bc (diff)
downloadFreeBSD-src-7fe296241e55d157f19280be5c203a147d931d5b.zip
FreeBSD-src-7fe296241e55d157f19280be5c203a147d931d5b.tar.gz
Adjust BOOTSTRAPPING test after MFC of kbdcontrol's -P option
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc15
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index a511582..77495a6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1520,8 +1520,9 @@ _crunch= usr.sbin/crunch
_awk= usr.bin/awk
.endif
-# r296926 -P keymap search path
-.if ${BOOTSTRAPPING} < 1100103
+# r296926 -P keymap search path, MFC to stable/10 in r298297
+.if ${BOOTSTRAPPING} < 1003501 || \
+ (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103)
_kbdcontrol= usr.sbin/kbdcontrol
.endif
OpenPOWER on IntegriCloud