From f1ff47be175bdcb8ed8512393fee9f9615501e24 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Sun, 8 Apr 2012 17:08:09 +0200
Subject: udev: keymap: remove rootprefix mangling from script

---
 Makefile.am                                  | 10 +++-------
 src/udev/keymap/keyboard-force-release.sh    | 22 ++++++++++++++++++++++
 src/udev/keymap/keyboard-force-release.sh.in | 22 ----------------------
 3 files changed, 25 insertions(+), 29 deletions(-)
 create mode 100755 src/udev/keymap/keyboard-force-release.sh
 delete mode 100755 src/udev/keymap/keyboard-force-release.sh.in

diff --git a/Makefile.am b/Makefile.am
index f22806e58d..d4b706eb3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1634,20 +1634,16 @@ dist_udevrules_DATA += \
 	src/udev/keymap/95-keyboard-force-release.rules
 
 dist_udevhome_SCRIPTS = \
-	src/udev/keymap/findkeyboards
-
-udevhome_SCRIPTS = \
+	src/udev/keymap/findkeyboards \
 	src/udev/keymap/keyboard-force-release.sh
 
 EXTRA_DIST += \
-	src/udev/keymap/check-keymaps.sh \
-	src/udev/keymap/keyboard-force-release.sh.in
+	src/udev/keymap/check-keymaps.sh
 
 CLEANFILES += \
 	$(nodist_keymap_SOURCES) \
 	src/udev/keymap/keys.txt \
-	src/udev/keymap/keys-from-name.gperf \
-	src/udev/keymap/keyboard-force-release.sh
+	src/udev/keymap/keys-from-name.gperf
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
diff --git a/src/udev/keymap/keyboard-force-release.sh b/src/udev/keymap/keyboard-force-release.sh
new file mode 100755
index 0000000000..a44fda2a2c
--- /dev/null
+++ b/src/udev/keymap/keyboard-force-release.sh
@@ -0,0 +1,22 @@
+#/bin/sh -e
+# read list of scancodes, convert hex to decimal and
+# append to the atkbd force_release sysfs attribute
+# $1 sysfs devpath for serioX
+# $2 file with scancode list (hex or dec)
+
+case "$2" in
+        /*) scf="$2" ;;
+        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
+esac
+
+read attr <"/sys/$1/force_release"
+while read scancode dummy; do
+        case "$scancode" in
+                \#*) ;;
+                *)
+                        scancode=$(($scancode))
+                        attr="$attr${attr:+,}$scancode"
+                        ;;
+        esac
+done <"$scf"
+echo "$attr" >"/sys/$1/force_release"
diff --git a/src/udev/keymap/keyboard-force-release.sh.in b/src/udev/keymap/keyboard-force-release.sh.in
deleted file mode 100755
index dd040cebc3..0000000000
--- a/src/udev/keymap/keyboard-force-release.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!@rootprefix@/bin/sh -e
-# read list of scancodes, convert hex to decimal and
-# append to the atkbd force_release sysfs attribute
-# $1 sysfs devpath for serioX
-# $2 file with scancode list (hex or dec)
-
-case "$2" in
-        /*) scf="$2" ;;
-        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
-esac
-
-read attr <"/sys/$1/force_release"
-while read scancode dummy; do
-        case "$scancode" in
-                \#*) ;;
-                *)
-                        scancode=$(($scancode))
-                        attr="$attr${attr:+,}$scancode"
-                        ;;
-        esac
-done <"$scf"
-echo "$attr" >"/sys/$1/force_release"
-- 
cgit v1.2.3-54-g00ecf