summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-06-02 14:46:05 -0400
committerKay Sievers <kay@vrfy.org>2012-06-02 21:39:39 +0200
commit7ff5404be1bad93cb8facbcae0bc78f77f9e067d (patch)
tree54ae442c85111936c31904f249a13d92919f134a
parent48ac500bb65f1f2eb09704f15104eeebb9330d47 (diff)
keymaps: replace dir tokens in keyboard-force-release
Use the correct udev libexec dir as well, not systemd's.
-rw-r--r--Makefile.am6
-rwxr-xr-xsrc/udev/keymap/keyboard-force-release.sh.in (renamed from src/udev/keymap/keyboard-force-release.sh)2
2 files changed, 5 insertions, 3 deletions
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
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"