60 files changed, 61 insertions, 61 deletions

diff --git a/Makefile.am b/Makefile.am
index 34e3982de4..d13963f71a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1809,64 +1809,64 @@ CLEANFILES += \
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
-	src/udev/keymap/keymaps/acer \
-	src/udev/keymap/keymaps/acer-aspire_5720 \
-	src/udev/keymap/keymaps/acer-aspire_8930 \
-	src/udev/keymap/keymaps/acer-aspire_5920g \
-	src/udev/keymap/keymaps/acer-aspire_6920 \
-	src/udev/keymap/keymaps/acer-travelmate_c300 \
-	src/udev/keymap/keymaps/asus \
-	src/udev/keymap/keymaps/compaq-e_evo \
-	src/udev/keymap/keymaps/dell \
-	src/udev/keymap/keymaps/dell-latitude-xt2 \
-	src/udev/keymap/keymaps/everex-xt5000 \
-	src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \
-	src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \
-	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
-	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
-	src/udev/keymap/keymaps/genius-slimstar-320 \
-	src/udev/keymap/keymaps/hewlett-packard \
-	src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \
-	src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \
-	src/udev/keymap/keymaps/hewlett-packard-pavilion \
-	src/udev/keymap/keymaps/hewlett-packard-presario-2100 \
-	src/udev/keymap/keymaps/hewlett-packard-tablet \
-	src/udev/keymap/keymaps/hewlett-packard-tx2 \
-	src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
-	src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \
-	src/udev/keymap/keymaps/lenovo-3000 \
-	src/udev/keymap/keymaps/lenovo-ideapad \
-	src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
-	src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \
-	src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \
-	src/udev/keymap/keymaps/lg-x110 \
-	src/udev/keymap/keymaps/logitech-wave \
-	src/udev/keymap/keymaps/logitech-wave-cordless \
-	src/udev/keymap/keymaps/logitech-wave-pro-cordless \
-	src/udev/keymap/keymaps/maxdata-pro_7000 \
-	src/udev/keymap/keymaps/medion-fid2060 \
-	src/udev/keymap/keymaps/medionnb-a555 \
-	src/udev/keymap/keymaps/micro-star \
-	src/udev/keymap/keymaps/module-asus-w3j \
-	src/udev/keymap/keymaps/module-ibm \
-	src/udev/keymap/keymaps/module-lenovo \
-	src/udev/keymap/keymaps/module-sony \
-	src/udev/keymap/keymaps/module-sony-old \
-	src/udev/keymap/keymaps/module-sony-vgn \
-	src/udev/keymap/keymaps/olpc-xo \
-	src/udev/keymap/keymaps/onkyo \
-	src/udev/keymap/keymaps/oqo-model2 \
-	src/udev/keymap/keymaps/samsung-other \
-	src/udev/keymap/keymaps/samsung-90x3a \
-	src/udev/keymap/keymaps/samsung-sq1us \
-	src/udev/keymap/keymaps/samsung-sx20s \
-	src/udev/keymap/keymaps/toshiba-satellite_a100 \
-	src/udev/keymap/keymaps/toshiba-satellite_a110 \
-	src/udev/keymap/keymaps/toshiba-satellite_m30x \
-	src/udev/keymap/keymaps/zepto-znote
+	keymaps/acer \
+	keymaps/acer-aspire_5720 \
+	keymaps/acer-aspire_8930 \
+	keymaps/acer-aspire_5920g \
+	keymaps/acer-aspire_6920 \
+	keymaps/acer-travelmate_c300 \
+	keymaps/asus \
+	keymaps/compaq-e_evo \
+	keymaps/dell \
+	keymaps/dell-latitude-xt2 \
+	keymaps/everex-xt5000 \
+	keymaps/fujitsu-amilo_li_2732 \
+	keymaps/fujitsu-amilo_pa_2548 \
+	keymaps/fujitsu-amilo_pro_edition_v3505 \
+	keymaps/fujitsu-amilo_pro_v3205 \
+	keymaps/fujitsu-amilo_si_1520 \
+	keymaps/fujitsu-esprimo_mobile_v5 \
+	keymaps/fujitsu-esprimo_mobile_v6 \
+	keymaps/genius-slimstar-320 \
+	keymaps/hewlett-packard \
+	keymaps/hewlett-packard-2510p_2530p \
+	keymaps/hewlett-packard-compaq_elitebook \
+	keymaps/hewlett-packard-pavilion \
+	keymaps/hewlett-packard-presario-2100 \
+	keymaps/hewlett-packard-tablet \
+	keymaps/hewlett-packard-tx2 \
+	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+	keymaps/inventec-symphony_6.0_7.0 \
+	keymaps/lenovo-3000 \
+	keymaps/lenovo-ideapad \
+	keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+	keymaps/lenovo-thinkpad_x6_tablet \
+	keymaps/lenovo-thinkpad_x200_tablet \
+	keymaps/lg-x110 \
+	keymaps/logitech-wave \
+	keymaps/logitech-wave-cordless \
+	keymaps/logitech-wave-pro-cordless \
+	keymaps/maxdata-pro_7000 \
+	keymaps/medion-fid2060 \
+	keymaps/medionnb-a555 \
+	keymaps/micro-star \
+	keymaps/module-asus-w3j \
+	keymaps/module-ibm \
+	keymaps/module-lenovo \
+	keymaps/module-sony \
+	keymaps/module-sony-old \
+	keymaps/module-sony-vgn \
+	keymaps/olpc-xo \
+	keymaps/onkyo \
+	keymaps/oqo-model2 \
+	keymaps/samsung-other \
+	keymaps/samsung-90x3a \
+	keymaps/samsung-sq1us \
+	keymaps/samsung-sx20s \
+	keymaps/toshiba-satellite_a100 \
+	keymaps/toshiba-satellite_a110 \
+	keymaps/toshiba-satellite_m30x \
+	keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
diff --git a/src/udev/keymap/keymaps/acer b/keymaps/acer
index 4e7c297dea..4e7c297dea 100644
--- a/src/udev/keymap/keymaps/acer
+++ b/keymaps/acer
diff --git a/src/udev/keymap/keymaps/acer-aspire_5720 b/keymaps/acer-aspire_5720
index 1496d63a52..1496d63a52 100644
--- a/src/udev/keymap/keymaps/acer-aspire_5720
+++ b/keymaps/acer-aspire_5720
diff --git a/src/udev/keymap/keymaps/acer-aspire_5920g b/keymaps/acer-aspire_5920g
index 633c4e854c..633c4e854c 100644
--- a/src/udev/keymap/keymaps/acer-aspire_5920g
+++ b/keymaps/acer-aspire_5920g
diff --git a/src/udev/keymap/keymaps/acer-aspire_6920 b/keymaps/acer-aspire_6920
index 699c954b4e..699c954b4e 100644
--- a/src/udev/keymap/keymaps/acer-aspire_6920
+++ b/keymaps/acer-aspire_6920
diff --git a/src/udev/keymap/keymaps/acer-aspire_8930 b/keymaps/acer-aspire_8930
index fb27bfb4f5..fb27bfb4f5 100644
--- a/src/udev/keymap/keymaps/acer-aspire_8930
+++ b/keymaps/acer-aspire_8930
diff --git a/src/udev/keymap/keymaps/acer-travelmate_c300 b/keymaps/acer-travelmate_c300
index bfef4cf868..bfef4cf868 100644
--- a/src/udev/keymap/keymaps/acer-travelmate_c300
+++ b/keymaps/acer-travelmate_c300
diff --git a/src/udev/keymap/keymaps/asus b/keymaps/asus
index 2a5995f982..2a5995f982 100644
--- a/src/udev/keymap/keymaps/asus
+++ b/keymaps/asus
diff --git a/src/udev/keymap/keymaps/compaq-e_evo b/keymaps/compaq-e_evo
index 5fbc573aa4..5fbc573aa4 100644
--- a/src/udev/keymap/keymaps/compaq-e_evo
+++ b/keymaps/compaq-e_evo
diff --git a/src/udev/keymap/keymaps/dell b/keymaps/dell
index 4f907b3eef..4f907b3eef 100644
--- a/src/udev/keymap/keymaps/dell
+++ b/keymaps/dell
diff --git a/src/udev/keymap/keymaps/dell-latitude-xt2 b/keymaps/dell-latitude-xt2
index 39872f559d..39872f559d 100644
--- a/src/udev/keymap/keymaps/dell-latitude-xt2
+++ b/keymaps/dell-latitude-xt2
diff --git a/src/udev/keymap/keymaps/everex-xt5000 b/keymaps/everex-xt5000
index 4823a832f5..4823a832f5 100644
--- a/src/udev/keymap/keymaps/everex-xt5000
+++ b/keymaps/everex-xt5000
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_li_2732 b/keymaps/fujitsu-amilo_li_2732
index 9b8b36a170..9b8b36a170 100644
--- a/src/udev/keymap/keymaps/fujitsu-amilo_li_2732
+++ b/keymaps/fujitsu-amilo_li_2732
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 b/keymaps/fujitsu-amilo_pa_2548
index f7b0c52444..f7b0c52444 100644
--- a/src/udev/keymap/keymaps/fujitsu-amilo_pa_2548
+++ b/keymaps/fujitsu-amilo_pa_2548
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 b/keymaps/fujitsu-amilo_pro_edition_v3505
index d2e38cbb23..d2e38cbb23 100644
--- a/src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
+++ b/keymaps/fujitsu-amilo_pro_edition_v3505
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 b/keymaps/fujitsu-amilo_pro_v3205
index 43e3199d59..43e3199d59 100644
--- a/src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205
+++ b/keymaps/fujitsu-amilo_pro_v3205
diff --git a/src/udev/keymap/keymaps/fujitsu-amilo_si_1520 b/keymaps/fujitsu-amilo_si_1520
index 1419bd9b5e..1419bd9b5e 100644
--- a/src/udev/keymap/keymaps/fujitsu-amilo_si_1520
+++ b/keymaps/fujitsu-amilo_si_1520
diff --git a/src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 b/keymaps/fujitsu-esprimo_mobile_v5
index d3d056b366..d3d056b366 100644
--- a/src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5
+++ b/keymaps/fujitsu-esprimo_mobile_v5
diff --git a/src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 b/keymaps/fujitsu-esprimo_mobile_v6
index 52c70c50cb..52c70c50cb 100644
--- a/src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6
+++ b/keymaps/fujitsu-esprimo_mobile_v6
diff --git a/src/udev/keymap/keymaps/genius-slimstar-320 b/keymaps/genius-slimstar-320
index d0a3656dd8..d0a3656dd8 100644
--- a/src/udev/keymap/keymaps/genius-slimstar-320
+++ b/keymaps/genius-slimstar-320
diff --git a/src/udev/keymap/keymaps/hewlett-packard b/keymaps/hewlett-packard
index 4461fa2ce5..4461fa2ce5 100644
--- a/src/udev/keymap/keymaps/hewlett-packard
+++ b/keymaps/hewlett-packard
diff --git a/src/udev/keymap/keymaps/hewlett-packard-2510p_2530p b/keymaps/hewlett-packard-2510p_2530p
index 41ad2e9b5a..41ad2e9b5a 100644
--- a/src/udev/keymap/keymaps/hewlett-packard-2510p_2530p
+++ b/keymaps/hewlett-packard-2510p_2530p
diff --git a/src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook b/keymaps/hewlett-packard-compaq_elitebook
index 42007c5483..42007c5483 100644
--- a/src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook
+++ b/keymaps/hewlett-packard-compaq_elitebook
diff --git a/src/udev/keymap/keymaps/hewlett-packard-pavilion b/keymaps/hewlett-packard-pavilion
index 3d3cefc8e6..3d3cefc8e6 100644
--- a/src/udev/keymap/keymaps/hewlett-packard-pavilion
+++ b/keymaps/hewlett-packard-pavilion
diff --git a/src/udev/keymap/keymaps/hewlett-packard-presario-2100 b/keymaps/hewlett-packard-presario-2100
index 1df39dcbd2..1df39dcbd2 100644
--- a/src/udev/keymap/keymaps/hewlett-packard-presario-2100
+++ b/keymaps/hewlett-packard-presario-2100
diff --git a/src/udev/keymap/keymaps/hewlett-packard-tablet b/keymaps/hewlett-packard-tablet
index d19005ab90..d19005ab90 100644
--- a/src/udev/keymap/keymaps/hewlett-packard-tablet
+++ b/keymaps/hewlett-packard-tablet
diff --git a/src/udev/keymap/keymaps/hewlett-packard-tx2 b/keymaps/hewlett-packard-tx2
index 36a690fcf6..36a690fcf6 100644
--- a/src/udev/keymap/keymaps/hewlett-packard-tx2
+++ b/keymaps/hewlett-packard-tx2
diff --git a/src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint b/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
index 027e50bf88..027e50bf88 100644
--- a/src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
+++ b/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
diff --git a/src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 b/keymaps/inventec-symphony_6.0_7.0
index 4a8b4ba5a7..4a8b4ba5a7 100644
--- a/src/udev/keymap/keymaps/inventec-symphony_6.0_7.0
+++ b/keymaps/inventec-symphony_6.0_7.0
diff --git a/src/udev/keymap/keymaps/lenovo-3000 b/keymaps/lenovo-3000
index 5bd165654a..5bd165654a 100644
--- a/src/udev/keymap/keymaps/lenovo-3000
+++ b/keymaps/lenovo-3000
diff --git a/src/udev/keymap/keymaps/lenovo-ideapad b/keymaps/lenovo-ideapad
index fc339839f2..fc339839f2 100644
--- a/src/udev/keymap/keymaps/lenovo-ideapad
+++ b/keymaps/lenovo-ideapad
diff --git a/src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
index 47e8846a68..47e8846a68 100644
--- a/src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
+++ b/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
diff --git a/src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet b/keymaps/lenovo-thinkpad_x200_tablet
index 31ea3b2c70..31ea3b2c70 100644
--- a/src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet
+++ b/keymaps/lenovo-thinkpad_x200_tablet
diff --git a/src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet b/keymaps/lenovo-thinkpad_x6_tablet
index 6fd16b5662..6fd16b5662 100644
--- a/src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet
+++ b/keymaps/lenovo-thinkpad_x6_tablet
diff --git a/src/udev/keymap/keymaps/lg-x110 b/keymaps/lg-x110
index ba08cba3fe..ba08cba3fe 100644
--- a/src/udev/keymap/keymaps/lg-x110
+++ b/keymaps/lg-x110
diff --git a/src/udev/keymap/keymaps/logitech-wave b/keymaps/logitech-wave
index caa5d5d310..caa5d5d310 100644
--- a/src/udev/keymap/keymaps/logitech-wave
+++ b/keymaps/logitech-wave
diff --git a/src/udev/keymap/keymaps/logitech-wave-cordless b/keymaps/logitech-wave-cordless
index a10dad5e4d..a10dad5e4d 100644
--- a/src/udev/keymap/keymaps/logitech-wave-cordless
+++ b/keymaps/logitech-wave-cordless
diff --git a/src/udev/keymap/keymaps/logitech-wave-pro-cordless b/keymaps/logitech-wave-pro-cordless
index e7aa02206c..e7aa02206c 100644
--- a/src/udev/keymap/keymaps/logitech-wave-pro-cordless
+++ b/keymaps/logitech-wave-pro-cordless
diff --git a/src/udev/keymap/keymaps/maxdata-pro_7000 b/keymaps/maxdata-pro_7000
index c0e4f77af4..c0e4f77af4 100644
--- a/src/udev/keymap/keymaps/maxdata-pro_7000
+++ b/keymaps/maxdata-pro_7000
diff --git a/src/udev/keymap/keymaps/medion-fid2060 b/keymaps/medion-fid2060
index 5a76c76799..5a76c76799 100644
--- a/src/udev/keymap/keymaps/medion-fid2060
+++ b/keymaps/medion-fid2060
diff --git a/src/udev/keymap/keymaps/medionnb-a555 b/keymaps/medionnb-a555
index c3b5dfa60b..c3b5dfa60b 100644
--- a/src/udev/keymap/keymaps/medionnb-a555
+++ b/keymaps/medionnb-a555
diff --git a/src/udev/keymap/keymaps/micro-star b/keymaps/micro-star
index 4a438698ed..4a438698ed 100644
--- a/src/udev/keymap/keymaps/micro-star
+++ b/keymaps/micro-star
diff --git a/src/udev/keymap/keymaps/module-asus-w3j b/keymaps/module-asus-w3j
index 773e0b3e82..773e0b3e82 100644
--- a/src/udev/keymap/keymaps/module-asus-w3j
+++ b/keymaps/module-asus-w3j
diff --git a/src/udev/keymap/keymaps/module-ibm b/keymaps/module-ibm
index a92dfa2506..a92dfa2506 100644
--- a/src/udev/keymap/keymaps/module-ibm
+++ b/keymaps/module-ibm
diff --git a/src/udev/keymap/keymaps/module-lenovo b/keymaps/module-lenovo
index 8e38883091..8e38883091 100644
--- a/src/udev/keymap/keymaps/module-lenovo
+++ b/keymaps/module-lenovo
diff --git a/src/udev/keymap/keymaps/module-sony b/keymaps/module-sony
index 7c000131d1..7c000131d1 100644
--- a/src/udev/keymap/keymaps/module-sony
+++ b/keymaps/module-sony
diff --git a/src/udev/keymap/keymaps/module-sony-old b/keymaps/module-sony-old
index 596a34258a..596a34258a 100644
--- a/src/udev/keymap/keymaps/module-sony-old
+++ b/keymaps/module-sony-old
diff --git a/src/udev/keymap/keymaps/module-sony-vgn b/keymaps/module-sony-vgn
index c8ba001516..c8ba001516 100644
--- a/src/udev/keymap/keymaps/module-sony-vgn
+++ b/keymaps/module-sony-vgn
diff --git a/src/udev/keymap/keymaps/olpc-xo b/keymaps/olpc-xo
index 34434a121d..34434a121d 100644
--- a/src/udev/keymap/keymaps/olpc-xo
+++ b/keymaps/olpc-xo
diff --git a/src/udev/keymap/keymaps/onkyo b/keymaps/onkyo
index ee864ade4d..ee864ade4d 100644
--- a/src/udev/keymap/keymaps/onkyo
+++ b/keymaps/onkyo
diff --git a/src/udev/keymap/keymaps/oqo-model2 b/keymaps/oqo-model2
index b7f4851abe..b7f4851abe 100644
--- a/src/udev/keymap/keymaps/oqo-model2
+++ b/keymaps/oqo-model2
diff --git a/src/udev/keymap/keymaps/samsung-90x3a b/keymaps/samsung-90x3a
index 3b65735fa0..3b65735fa0 100644
--- a/src/udev/keymap/keymaps/samsung-90x3a
+++ b/keymaps/samsung-90x3a
diff --git a/src/udev/keymap/keymaps/samsung-other b/keymaps/samsung-other
index 3ac0c2f10c..3ac0c2f10c 100644
--- a/src/udev/keymap/keymaps/samsung-other
+++ b/keymaps/samsung-other
diff --git a/src/udev/keymap/keymaps/samsung-sq1us b/keymaps/samsung-sq1us
index ea2141ef84..ea2141ef84 100644
--- a/src/udev/keymap/keymaps/samsung-sq1us
+++ b/keymaps/samsung-sq1us
diff --git a/src/udev/keymap/keymaps/samsung-sx20s b/keymaps/samsung-sx20s
index 9d954ee415..9d954ee415 100644
--- a/src/udev/keymap/keymaps/samsung-sx20s
+++ b/keymaps/samsung-sx20s
diff --git a/src/udev/keymap/keymaps/toshiba-satellite_a100 b/keymaps/toshiba-satellite_a100
index 22007be71b..22007be71b 100644
--- a/src/udev/keymap/keymaps/toshiba-satellite_a100
+++ b/keymaps/toshiba-satellite_a100
diff --git a/src/udev/keymap/keymaps/toshiba-satellite_a110 b/keymaps/toshiba-satellite_a110
index 1429409351..1429409351 100644
--- a/src/udev/keymap/keymaps/toshiba-satellite_a110
+++ b/keymaps/toshiba-satellite_a110
diff --git a/src/udev/keymap/keymaps/toshiba-satellite_m30x b/keymaps/toshiba-satellite_m30x
index ae8e34941b..ae8e34941b 100644
--- a/src/udev/keymap/keymaps/toshiba-satellite_m30x
+++ b/keymaps/toshiba-satellite_m30x
diff --git a/src/udev/keymap/keymaps/zepto-znote b/keymaps/zepto-znote
index cf72fda47b..cf72fda47b 100644
--- a/src/udev/keymap/keymaps/zepto-znote
+++ b/keymaps/zepto-znote
diff --git a/src/udev/keymap/check-keymaps.sh b/src/udev/keymap/check-keymaps.sh
index 765e582af4..c4572745e0 100755
--- a/src/udev/keymap/check-keymaps.sh
+++ b/src/udev/keymap/check-keymaps.sh
@@ -5,7 +5,7 @@
 # Makefile.am
 SRCDIR=${1:-.}
 KEYLIST=${2:-src/udev/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/src/udev/keymap/keymaps
+KEYMAPS_DIR=$SRCDIR/keymaps
 RULES=$SRCDIR/src/udev/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
@@ -16,7 +16,7 @@ RULES=$SRCDIR/src/udev/keymap/95-keymap.rules
 missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
                     <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
 [ -z "$missing" ] || {
-        echo "ERROR: unknown key names in src/udev/keymap/keymaps/*:" >&2
+        echo "ERROR: unknown key names in keymaps/*:" >&2
         echo "$missing" >&2
         exit 1
 }
@@ -31,7 +31,7 @@ for m in $maps; do
                 echo "ERROR: unknown map name in $RULES: $m" >&2
                 exit 1
         }
-        grep -q "src/udev/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+        grep -q "keymaps/$m\>" $SRCDIR/Makefile.am || {
                 echo "ERROR: map file $m is not added to Makefile.am" >&2
                 exit 1
         }