svn commit: r298402 - head

[Ed Maste]

Author: emaste
Date: Thu Apr 21 13:14:55 2016
New Revision: 298402
URL: https://svnweb.freebsd.org/changeset/base/298402

Log:
  Adjust BOOTSTRAPPING test after MFC of kbdcontrol's -P option

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Apr 21 12:58:29 2016	(r298401)
+++ head/Makefile.inc1	Thu Apr 21 13:14:55 2016	(r298402)
@@ -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