Author: emaste
Date: Tue Mar 15 17:32:29 2016
New Revision: 296914
URL: https://svnweb.freebsd.org/changeset/base/296914

Log:
  Fix copy-n-pasteo in r296899 ukbdmap.h header generation for pc98
  
  The ukbd default is specified by UKBD_DFLT_KEYMAP not ATKBD_DFLT_KEYMAP.
  
  PR:           193865
  Submitted by: Harald Schmalzbauer

Modified:
  head/sys/conf/files.pc98

Modified: head/sys/conf/files.pc98
==============================================================================
--- head/sys/conf/files.pc98    Tue Mar 15 17:09:27 2016        (r296913)
+++ head/sys/conf/files.pc98    Tue Mar 15 17:32:29 2016        (r296914)
@@ -46,7 +46,7 @@ svr4_assym.h                  optional        compat_svr4     
        \
        clean           "svr4_assym.h"
 #
 ukbdmap.h                      optional        ukbd_dflt_keymap        \
-       compile-with    "unset KEYMAP_PATH; for kmpath in 
${S:S/sys$/share/}/vt/keymaps ${S:S/sys$/share/}/syscons/keymaps; do 
kmapfile=$${kmpath}/${ATKBD_DFLT_KEYMAP:C/\.kbd$$//}.kbd; if [ -r $${kmapfile} 
]; then KEYMAP_PATH=$${kmpath}; fi; done; if [ X$${KEYMAP_PATH} != X ]; then 
env KEYMAP_PATH=$${KEYMAP_PATH} /usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | 
sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static 
accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h; else echo 
Error:   ukbd_dflt_keymap not found; exit 1; fi"                 \
+       compile-with    "unset KEYMAP_PATH; for kmpath in 
${S:S/sys$/share/}/vt/keymaps ${S:S/sys$/share/}/syscons/keymaps; do 
kmapfile=$${kmpath}/${UKBD_DFLT_KEYMAP:C/\.kbd$$//}.kbd; if [ -r $${kmapfile} 
]; then KEYMAP_PATH=$${kmpath}; fi; done; if [ X$${KEYMAP_PATH} != X ]; then 
env KEYMAP_PATH=$${KEYMAP_PATH} /usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | 
sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static 
accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h; else echo 
Error:    ukbd_dflt_keymap not found; exit 1; fi"                 \
        no-obj no-implicit-rule before-depend                           \
        clean           "ukbdmap.h"
 #
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to