From 97c316c68c689a0c974d484b4a2b4e9c2b72aaa3 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 21 Apr 2016 13:14:55 +0000
Subject: [PATCH] Adjust BOOTSTRAPPING test after MFC of kbdcontrol's -P option

---
 Makefile.inc1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index a5115822f2ec..77495a6d267b 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