summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-05-12 09:19:36 +0000
committersobomax <sobomax@FreeBSD.org>2001-05-12 09:19:36 +0000
commitc54bb729f38ba0bd829a4234d10bac34d699c407 (patch)
tree41ce14f803e5b8a6e98480e122d1b12647791cf9 /usr.sbin
parent91ffa34b5cb9e31e6e76240b292b5e7655287f3b (diff)
downloadFreeBSD-src-c54bb729f38ba0bd829a4234d10bac34d699c407.zip
FreeBSD-src-c54bb729f38ba0bd829a4234d10bac34d699c407.tar.gz
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 <fullermd@over-yonder.net>
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sade/Makefile3
-rw-r--r--usr.sbin/sysinstall/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index bfaf602..9f552ef 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 bfaf602..9f552ef 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
OpenPOWER on IntegriCloud