From patchwork Tue Apr 12 02:10:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robby Workman X-Patchwork-Id: 699151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3C2MVCI026075 for ; Tue, 12 Apr 2011 02:22:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754153Ab1DLCWY (ORCPT ); Mon, 11 Apr 2011 22:22:24 -0400 Received: from connie.slackware.com ([64.57.102.36]:53592 "EHLO connie.slackware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755440Ab1DLCWM (ORCPT ); Mon, 11 Apr 2011 22:22:12 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 12 Apr 2011 02:22:31 +0000 (UTC) X-Greylist: delayed 675 seconds by postgrey-1.27 at vger.kernel.org; Mon, 11 Apr 2011 22:22:11 EDT Received: from connie.slackware.com (localhost [127.0.0.1]) by connie.slackware.com (8.14.3/8.14.3) with ESMTP id p3C2AavR032107; Mon, 11 Apr 2011 19:10:36 -0700 Received: from localhost (rworkman@localhost) by connie.slackware.com (8.14.3/8.14.3/Submit) with ESMTP id p3C2AajL032104; Mon, 11 Apr 2011 19:10:36 -0700 X-Authentication-Warning: connie.slackware.com: rworkman owned process doing -bs Date: Mon, 11 Apr 2011 19:10:36 -0700 (PDT) From: Robby Workman To: linux-media@vger.kernel.org cc: Patrick Volkerding Subject: [PATCHES] Misc. trivial fixes Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 From d3356b0cf968c41b1d44fcc682a44112ffff9d0b Mon Sep 17 00:00:00 2001 From: Robby Workman 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(-) -- 1.7.4.4 From 0b5f4bc501c896155401226b188688fd3bef1f5c Mon Sep 17 00:00:00 2001 From: Robby Workman 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 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