From 87dc3f46be7f0fdc6d8196d41920724af0c08de5 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Sat, 12 May 2001 09:19:36 +0000 Subject: [PATCH] Take keyboard map files from ${.CURDIR}/../../share/syscons/keymaps, not from /usr/share/syscons/keymaps. This should prevent word breakage when new keymaps have been added. Prompted by: Matthew D. Fuller --- usr.sbin/sade/Makefile | 3 ++- usr.sbin/sysinstall/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index bfaf6021d5b..9f552efb086 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -84,7 +84,8 @@ KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \ keymap.h: rm -f keymap.tmp for map in ${KEYMAPS} ; do \ - kbdcontrol -L $$map | \ + env KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \ + kbdcontrol -L $$map | \ sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \ done echo "static struct keymapInfo keymapInfos[] = {" >> keymap.tmp diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index bfaf6021d5b..9f552efb086 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -84,7 +84,8 @@ KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \ keymap.h: rm -f keymap.tmp for map in ${KEYMAPS} ; do \ - kbdcontrol -L $$map | \ + env KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \ + kbdcontrol -L $$map | \ sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \ done echo "static struct keymapInfo keymapInfos[] = {" >> keymap.tmp