diff options
| author | emaste <emaste@FreeBSD.org> | 2016-04-21 19:24:36 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-04-21 19:24:36 +0000 |
| commit | b322fc6681dd970edae349cffc7b60a1f5e8a990 (patch) | |
| tree | 7a4b1b4ac3ba8ad5c0ee13626eb7e38bd4dfecd0 /Makefile.inc1 | |
| parent | 6611085190633135fec6ff39c3f81444d9a7aef0 (diff) | |
| download | FreeBSD-src-b322fc6681dd970edae349cffc7b60a1f5e8a990.zip FreeBSD-src-b322fc6681dd970edae349cffc7b60a1f5e8a990.tar.gz | |
Fix compiled-in keymap generation for sc/vt consoles
In r298297 kbdcontrol's -P <path> option was MFC'd to stable/10, which
enables this change for a simplified compile-time default keymap build
process.
PR: 193865
MFC of: r296899, r296914, r297363, r298402
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 9f96c7a..78a149e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1321,6 +1321,12 @@ _cat= bin/cat _awk= usr.bin/awk .endif +# r296926 -P keymap search path, MFC to stable/10 in r298297 +.if ${BOOTSTRAPPING} < 1003501 || \ + (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) +_kbdcontrol= usr.sbin/kbdcontrol +.endif + .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -1391,6 +1397,7 @@ bootstrap-tools: .PHONY ${_dtc} \ ${_awk} \ ${_cat} \ + ${_kbdcontrol} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ |
