public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCHES] Misc. trivial fixes
@ 2011-04-12  2:10 Robby Workman
  2011-04-12  2:14 ` Robby Workman
  2011-04-12 12:13 ` Andreas Oberritter
  0 siblings, 2 replies; 9+ messages in thread
From: Robby Workman @ 2011-04-12  2:10 UTC (permalink / raw)
  To: linux-media; +Cc: Patrick Volkerding

[-- Attachment #1: Type: TEXT/PLAIN, Size: 235 bytes --]

Patch #1 installs udev rules files to /lib/udev/rules.d/ instead
of /etc/udev/rules.d/ - see commit message for more info.

Patch #2 allows override of manpage installation directory by
packagers - see commit message for more info

-RW

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1960 bytes --]

From d3356b0cf968c41b1d44fcc682a44112ffff9d0b Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Mon, 11 Apr 2011 20:41:28 -0500
Subject: [PATCH 1/2] Install udev rules to /lib/udev/ instead of /etc/udev

In moderately recent versions of udev, 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(-)

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
 
-- 
1.7.4.4


[-- Attachment #3: Type: TEXT/PLAIN, Size: 1521 bytes --]

From 0b5f4bc501c896155401226b188688fd3bef1f5c Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Mon, 11 Apr 2011 20:50:18 -0500
Subject: [PATCH 2/2] Allow override of manpage installation directory

This creates MANDIR in Make.rules and keeps the preexisting
default of /usr/share/man, but allows packagers to easily
override via e.g. "make MANDIR=/usr/man"
---
 Make.rules              |    1 +
 utils/keytable/Makefile |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Make.rules b/Make.rules
index 0bb2eb8..1529ef8 100644
--- a/Make.rules
+++ b/Make.rules
@@ -11,6 +11,7 @@ PREFIX = /usr/local
 LIBDIR = $(PREFIX)/lib
 # subdir below LIBDIR in which to install the libv4lx libc wrappers
 LIBSUBDIR = libv4l
+MANDIR = /usr/share/man
 
 # These ones should not be overriden from the cmdline
 
diff --git a/utils/keytable/Makefile b/utils/keytable/Makefile
index 29a6ac4..e093280 100644
--- a/utils/keytable/Makefile
+++ b/utils/keytable/Makefile
@@ -39,7 +39,7 @@ install: $(TARGETS)
 	install -m 644 -p rc_keymaps/* $(DESTDIR)/etc/rc_keymaps
 	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
+	install -m 755 -d $(DESTDIR)$(MANDIR)/man1
+	install -m 644 -p ir-keytable.1 $(DESTDIR)$(MANDIR)/man1
 
 include ../../Make.rules
-- 
1.7.4.4


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-05-03  4:07 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-12  2:10 [PATCHES] Misc. trivial fixes Robby Workman
2011-04-12  2:14 ` Robby Workman
2011-04-12 12:13 ` Andreas Oberritter
2011-04-12 14:31   ` Robby Workman
2011-04-13 18:20     ` Andreas Oberritter
2011-05-02 20:22       ` Mauro Carvalho Chehab
2011-05-03  2:48         ` Robby Workman
2011-05-03  3:42           ` Mauro Carvalho Chehab
2011-05-03  4:07             ` Robby Workman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox