From 7ff5404be1bad93cb8facbcae0bc78f77f9e067d Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 2 Jun 2012 14:46:05 -0400 Subject: [PATCH] keymaps: replace dir tokens in keyboard-force-release Use the correct udev libexec dir as well, not systemd's. --- Makefile.am | 6 ++++-- ...yboard-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 597711ea71..85953c7853 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 a44fda2a2c..152633c3b9 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"