From patchwork Tue Apr 12 14:31:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robby Workman X-Patchwork-Id: 700191 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 p3CEViIY027723 for ; Tue, 12 Apr 2011 14:31:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755826Ab1DLObf (ORCPT ); Tue, 12 Apr 2011 10:31:35 -0400 Received: from connie.slackware.com ([64.57.102.36]:40423 "EHLO connie.slackware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759Ab1DLObf (ORCPT ); Tue, 12 Apr 2011 10:31:35 -0400 Received: from connie.slackware.com (localhost [127.0.0.1]) by connie.slackware.com (8.14.3/8.14.3) with ESMTP id p3CEVRJX007379; Tue, 12 Apr 2011 07:31:27 -0700 Received: from localhost (rworkman@localhost) by connie.slackware.com (8.14.3/8.14.3/Submit) with ESMTP id p3CEVR8N007376; Tue, 12 Apr 2011 07:31:27 -0700 X-Authentication-Warning: connie.slackware.com: rworkman owned process doing -bs Date: Tue, 12 Apr 2011 07:31:27 -0700 (PDT) From: Robby Workman To: Andreas Oberritter cc: linux-media@vger.kernel.org, Patrick Volkerding Subject: Re: [PATCHES] Misc. trivial fixes In-Reply-To: <4DA441D9.2000601@linuxtv.org> Message-ID: References: <4DA441D9.2000601@linuxtv.org> 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 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 14:31:44 +0000 (UTC) On Tue, 12 Apr 2011, Andreas Oberritter wrote: > On 04/12/2011 04:10 AM, Robby Workman wrote: >> --- 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 > > Why did you hardcode /usr instead of keeping $(PREFIX)/share/man? Eek. I'd like to say that I sent the wrong patch, but alas, I simply had a thinko. See attached (better) patch :-) -RW From 6ef4a1fecee242be9658528ef7663845d9bd6bc6 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 12 Apr 2011 09:26:57 -0500 Subject: [PATCH] Allow override of manpage installation directory This creates MANDIR in Make.rules and keeps the preexisting default of $(PREFIX)/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(-) -- 1.7.4.4 diff --git a/Make.rules b/Make.rules index 0bb2eb8..875828a 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 = $(PREFIX)/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