[systemd-devel] [PATCH] Replace dir tokens in keyboard-force-release

[Dave Reisner]

Use the correct udev libexec dir as well, not systemd's.
---
 Makefile.am                                                      |    6 ++++--
 .../{keyboard-force-release.sh => keyboard-force-release.sh.in}  |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename src/udev/keymap/{keyboard-force-release.sh => keyboard-force-release.sh.in} (89%)

diff --git a/Makefile.am b/Makefile.am
index 597711e..85953c7 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 a44fda2..152633c 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"
-- 
1.7.10.3