From 3b338b6bb9747c5d56fdf73da113e3e0dd710704 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 19 Jun 2009 11:48:04 +0200
Subject: [PATCH 1/1] extras/keymap: install findkeyboards in /lib/udev

---
 extras/keymap/Makefile.am | 118 +++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 65 deletions(-)

diff --git a/extras/keymap/Makefile.am b/extras/keymap/Makefile.am
index 55cce54ea..5c74575c6 100644
--- a/extras/keymap/Makefile.am
+++ b/extras/keymap/Makefile.am
@@ -1,68 +1,51 @@
-# keymap is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# keymap is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with keymap; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
 include $(top_srcdir)/Makefile.am.inc
 
-# rules and keymaps
 dist_udevrules_DATA = 95-keymap.rules
 
 udevkeymapdir = $(libexecdir)/keymaps
 udevkeymap_DATA = \
- keymaps/acer \
- keymaps/acer-aspire_5920g \
- keymaps/acer-extensa_5xxx \
- keymaps/acer-travelmate_6292 \
- keymaps/acer-travelmate_c300 \
- keymaps/asus \
- keymaps/benq-joybook_r22 \
- keymaps/compaq-e_evo \
- keymaps/dell \
- 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/hewlett-packard \
- keymaps/hewlett-packard-2510p_2530p \
- keymaps/hewlett-packard-compaq_elitebook \
- keymaps/hewlett-packard-pavilion \
- keymaps/hewlett-packard-tablet \
- keymaps/hewlett-packard-tx2 \
- keymaps/inventec-symphony_6.0_7.0 \
- keymaps/lenovo-3000 \
- keymaps/lenovo-thinkpad_x6_tablet \
- keymaps/lenovo-thinkpad_x200_tablet \
- 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/oqo-model2 \
- keymaps/samsung-other \
- keymaps/samsung-sq1us \
- keymaps/samsung-sx20s \
- keymaps/toshiba-satellite_a100 \
- keymaps/toshiba-satellite_a110
-
-dist_pkgdata_SCRIPTS = findkeyboards
+keymaps/acer \
+	keymaps/acer-aspire_5920g \
+	keymaps/acer-extensa_5xxx \
+	keymaps/acer-travelmate_6292 \
+	keymaps/acer-travelmate_c300 \
+	keymaps/asus \
+	keymaps/benq-joybook_r22 \
+	keymaps/compaq-e_evo \
+	keymaps/dell \
+	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/hewlett-packard \
+	keymaps/hewlett-packard-2510p_2530p \
+	keymaps/hewlett-packard-compaq_elitebook \
+	keymaps/hewlett-packard-pavilion \
+	keymaps/hewlett-packard-tablet \
+	keymaps/hewlett-packard-tx2 \
+	keymaps/inventec-symphony_6.0_7.0 \
+	keymaps/lenovo-3000 \
+	keymaps/lenovo-thinkpad_x6_tablet \
+	keymaps/lenovo-thinkpad_x200_tablet \
+	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/oqo-model2 \
+	keymaps/samsung-other \
+	keymaps/samsung-sq1us \
+	keymaps/samsung-sx20s \
+	keymaps/toshiba-satellite_a100 \
+	keymaps/toshiba-satellite_a110
 
-# keymap program
+dist_libexec_SCRIPTS = findkeyboards
 
 libexec_PROGRAMS = keymap
 
@@ -72,14 +55,19 @@ keymap_CPPFLAGS = $(AM_CPPFLAGS)
 
 dist_doc_DATA = README.keymap.txt
 
-EXTRA_DIST=keymaps check-keymaps.sh
-BUILT_SOURCES = keys-from-name.h keys-to-name.h
-CLEANFILES = keys.txt keys-from-name.gperf keys-from-name.h keys-to-name.h
-TESTS = check-keymaps.sh
+EXTRA_DIST = \
+	keymaps \
+	check-keymaps.sh
 
-#
-# generation of keys-{from,to}-name.h from linux/input.h and gperf
-#
+BUILT_SOURCES = \
+	keys-from-name.h \
+	keys-to-name.h
+
+CLEANFILES = \
+	keys.txt keys-from-name.gperf \
+	keys-from-name.h keys-to-name.h
+
+TESTS = check-keymaps.sh
 
 keys.txt: /usr/include/linux/input.h
 	$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@
-- 
2.30.2