From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 2 Jun 2012 18:46:05 +0000 (-0400)
Subject: keymaps: replace dir tokens in keyboard-force-release
X-Git-Tag: v185~13
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7ff5404be1bad93cb8facbcae0bc78f77f9e067d;hp=48ac500bb65f1f2eb09704f15104eeebb9330d47

keymaps: replace dir tokens in keyboard-force-release

Use the correct udev libexec dir as well, not systemd's.
---

diff --git a/Makefile.am b/Makefile.am
index 597711ea7..85953c785 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1911,12 +1911,14 @@ TESTS += \
 	src/udev/keymap/check-keymaps.sh
 
 EXTRA_DIST += \
-	src/udev/keymap/check-keymaps.sh
+	src/udev/keymap/check-keymaps.sh \
+	src/udev/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
 	$(nodist_keymap_SOURCES) \
 	src/udev/keymap/keys.txt \
-	src/udev/keymap/keys-from-name.gperf
+	src/udev/keymap/keys-from-name.gperf \
+	src/udev/keymap/keyboard-force-release.sh
 
 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.in
similarity index 89%
rename from src/udev/keymap/keyboard-force-release.sh
rename to src/udev/keymap/keyboard-force-release.sh.in
index a44fda2a2..152633c3b 100755
--- a/src/udev/keymap/keyboard-force-release.sh
+++ b/src/udev/keymap/keyboard-force-release.sh.in
@@ -6,7 +6,7 @@
 
 case "$2" in
         /*) scf="$2" ;;
-        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
+        *)  scf="@udevlibexecdir@/keymaps/force-release/$2" ;;
 esac
 
 read attr <"/sys/$1/force_release"