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 597711ea7122597b6340cd2628b92423ff328c6f..85953c7853287de5d3606afc5bfca274526de1cf 100644 (file)
--- 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 a44fda2a2c3ed2f097b53518515ae01e7308fdac..152633c3b97ac7db1cb7b91a203712a2622c4dc2 100755 (executable)
--- 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"