[1/2] Install udev rules to /lib/udev/ instead of /etc/udev

Commit Message

Robby Workman May 3, 2011, 4:32 a.m. UTC

From bb5b3e288b3f13ad586498ebd1cba7b2651649b1 Mon Sep 17 00:00:00 2001
From: Robby Workman <[e-mail]>
Date: Mon, 2 May 2011 23:28:37 -0500
Subject: [PATCH 1/2] Install udev rules to /lib/udev/ instead of /etc/udev

In moderately recent versions of udev (since 125 in 7/2008),
packages should install rules files to /lib/udev/rules.d/
instead of /etc/udev/rules.d/, as /etc/udev/rules.d/ is now
for generated rules and overrides of the packaged rules.
---
 utils/keytable/70-infrared.rules |    4 +---
 utils/keytable/Makefile          |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

Patch

diff --git a/utils/keytable/70-infrared.rules b/utils/keytable/70-infrared.rules
index 308a6d4..afffd95 100644
--- a/utils/keytable/70-infrared.rules
+++ b/utils/keytable/70-infrared.rules
@@ -1,6 +1,4 @@ 
 # Automatically load the proper keymaps after the Remote Controller device
-# creation.
-# Copy this file at /etc/udev/rules.d/70-infrared.rules in order to load keytables
-# during boot time. The keycode tables rules should be at /etc/rc_maps.cfg
+# creation.  The keycode tables rules should be at /etc/rc_maps.cfg
 
 ACTION=="add", SUBSYSTEM=="rc", RUN+="/usr/bin/ir-keytable -a /etc/rc_maps.cfg -s $name"
diff --git a/utils/keytable/Makefile b/utils/keytable/Makefile
index aa020ef..29a6ac4 100644
--- a/utils/keytable/Makefile
+++ b/utils/keytable/Makefile
@@ -37,8 +37,8 @@  install: $(TARGETS)
 	install -m 644 -p rc_maps.cfg $(DESTDIR)/etc
 	install -m 755 -d $(DESTDIR)/etc/rc_keymaps
 	install -m 644 -p rc_keymaps/* $(DESTDIR)/etc/rc_keymaps
-	install -m 755 -d $(DESTDIR)/etc/udev/rules.d
-	install -m 644 -p 70-infrared.rules $(DESTDIR)/etc/udev/rules.d
+	install -m 755 -d $(DESTDIR)/lib/udev/rules.d
+	install -m 644 -p 70-infrared.rules $(DESTDIR)/lib/udev/rules.d
 	install -m 755 -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 -p ir-keytable.1 $(DESTDIR)$(PREFIX)/share/man/man1