use libexecdir, bindir, sbindir, switch to /usr/lib/udev in documentation

5 files changed, 11 insertions, 11 deletions

diff --git a/extras/keymap/.gitignore b/extras/keymap/.gitignore
index f2c4c8dca6..01d62e2b6e 100644
--- a/extras/keymap/.gitignore
+++ b/extras/keymap/.gitignore
@@ -1,6 +1,6 @@
+keyboard-force-release.sh
 keymap
 keys-from-name.gperf
 keys-from-name.h
 keys-to-name.h
 keys.txt
-
diff --git a/extras/keymap/95-keyboard-force-release.rules b/extras/keymap/95-keyboard-force-release.rules
index 63cf67fb59..79a1bc1cc4 100644
--- a/extras/keymap/95-keyboard-force-release.rules
+++ b/extras/keymap/95-keyboard-force-release.rules
@@ -5,10 +5,10 @@
 # The atkbd driver has a quirk handler for generating synthetic
 # release events, which can be configured via sysfs since 2.6.32.
 # Simply add a file with a list of scancodes for your laptop model
-# in /lib/udev/keymaps, and add a rule here.
+# in /usr/lib/udev/keymaps, and add a rule here.
 # If the hotkeys also need a keymap assignment you can copy the
 # scancodes from the keymap file, otherwise you can run
-# /lib/udev/keymap -i /dev/input/eventX
+# /usr/lib/udev/keymap -i /dev/input/eventX
 # on a Linux vt to find out.
 
 ACTION=="remove", GOTO="force_release_end"
diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules
index 248c58f09c..1ec18b7f55 100644
--- a/extras/keymap/95-keymap.rules
+++ b/extras/keymap/95-keymap.rules
@@ -2,7 +2,7 @@
 #
 # Key map overrides can be specified by either giving scancode/keyname pairs
 # directly as keymap arguments (if there are just one or two to change), or as
-# a file name (in /lib/udev/keymaps), which has to contain scancode/keyname
+# a file name (in /usr/lib/udev/keymaps), which has to contain scancode/keyname
 # pairs.
 
 ACTION=="remove", GOTO="keyboard_end"
diff --git a/extras/keymap/README.keymap.txt b/extras/keymap/README.keymap.txt
index 79d9971b1d..acdc00283a 100644
--- a/extras/keymap/README.keymap.txt
+++ b/extras/keymap/README.keymap.txt
@@ -44,7 +44,7 @@ for inclusion you need to do the following steps:
 
  1. Find the keyboard device.
 
- Run /lib/udev/findkeyboards. This should always give you an "AT
+ Run /usr/lib/udev/findkeyboards. This should always give you an "AT
  keyboard" and possibly a "module". Some laptops (notably Thinkpads, Sonys, and
  Acers) have multimedia/function keys on a separate input device instead of the
  primary keyboard. The keyboard device should have a name like "input/event3".
@@ -53,7 +53,7 @@ for inclusion you need to do the following steps:
 
  2. Find broken scan codes:
 
- sudo /lib/udev/keymap -i input/eventX
+ sudo /usr/lib/udev/keymap -i input/eventX
 
  Press all multimedia/function keys and check if the key name that gets printed
  out is plausible. If it is unknown or wrong, write down the scan code (looks
@@ -67,14 +67,14 @@ for inclusion you need to do the following steps:
    0x1E www # Fn+F2 web browser
 
  Repeat that for all other keys. Write the resulting list into a file. Look at
- /lib/udev/keymaps/ for existing key map files and make sure that you use the
+ /usr/lib/udev/keymaps/ for existing key map files and make sure that you use the
  same structure.
 
  If the key only ever works once and then your keyboard (or the entire desktop)
  gets stuck for a long time, then it is likely that the BIOS fails to send a
  corresponding "key release" event after the key press event. Please note down
  this case as well, as it can be worked around in
- /lib/udev/keymaps/95-keyboard-force-release.rules .
+ /usr/lib/udev/keymaps/95-keyboard-force-release.rules .
 
  3. Find out your system vendor and product:
 
@@ -87,8 +87,8 @@ for inclusion you need to do the following steps:
  and /tmp/udev-db.txt from step 4 to the linux-hotplug@vger.kernel.org mailing
  list, so that they can be included in the next release.
 
-For local testing, copy your map file to /lib/udev/keymaps/ with an appropriate
-name, and add an appropriate udev rule to /lib/udev/rules.d/95-keymap.rules:
+For local testing, copy your map file to /usr/lib/udev/keymaps/ with an appropriate
+name, and add an appropriate udev rule to /usr/lib/udev/rules.d/95-keymap.rules:
 
   * If you selected an "AT keyboard", add the rule to the section after
   'LABEL="keyboard_vendorcheck"'.
diff --git a/extras/keymap/keyboard-force-release.sh b/extras/keymap/keyboard-force-release.sh.in
index b157ac310d..05dd5da2e0 100644
--- a/extras/keymap/keyboard-force-release.sh
+++ b/extras/keymap/keyboard-force-release.sh.in
@@ -6,7 +6,7 @@
 
 case "$2" in
 	/*) scf="$2" ;;
-	*)  scf="/lib/udev/keymaps/force-release/$2" ;;
+	*)  scf="@libexecdir@/keymaps/force-release/$2" ;;
 esac
 
 read attr <"/sys/$1/force_release"