From patchwork Sun Aug 14 11:44:14 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
X-Patchwork-Id: 11976
Received: from tiger.cadsoft.de ([217.7.101.210])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1E4GuY-0001bw-Cy
	for vdr@linuxtv.org; Sun, 14 Aug 2005 13:44:18 +0200
Received: from raven.cadsoft.de (raven.cadsoft.de [217.7.101.211])
	by tiger.cadsoft.de (8.12.7/8.12.7) with ESMTP id j7EBiHHS031147
	for <vdr@linuxtv.org>; Sun, 14 Aug 2005 13:44:17 +0200
Received: from [192.168.100.10] (hawk.cadsoft.de [192.168.100.10])
	by raven.cadsoft.de (8.13.3/8.13.3) with ESMTP id j7EBiGkS018579
	for <vdr@linuxtv.org>; Sun, 14 Aug 2005 13:44:17 +0200
Message-ID: <42FF2E8E.3060108@cadsoft.de>
Date: Sun, 14 Aug 2005 13:44:14 +0200
From: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
Organization: CadSoft Computer GmbH
User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050317)
X-Accept-Language: en
MIME-Version: 1.0
To: vdr@linuxtv.org
Subject: Re: [vdr] Patch to Makefile so plugins are installed and man dirs
	are	created
References: <42FEF9AE.3030309@syphir.sytes.net>
In-Reply-To: <42FEF9AE.3030309@syphir.sytes.net>
X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-2.0
	(tiger.cadsoft.de [217.7.101.210]);
	Sun, 14 Aug 2005 13:44:17 +0200 (CEST)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Sun, 14 Aug 2005 13:44:17 +0200 (CEST)
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Aug 2005 11:44:18 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 4169

C.Y.M wrote:
> Hello,
> 
> Attached is a patch so VDR does not error during the installation if the man
> directories do not exist.  Also, this patch installs the plugins as well as the
> vdr binary when "make install" is used.

I'd say the attached reduced version should suffice, since 'mkdir -p'
behaves nicely if the directory already exists, so there's no need
to check this first.

Klaus

--- Makefile	2005/07/31 11:20:20	1.76
+++ Makefile	2005/08/14 11:42:20
@@ -183,11 +183,16 @@
 # Install the files:
 
 install:
+	@mkdir -p $(BINDIR)
 	@cp vdr runvdr $(BINDIR)
+	@mkdir -p $(BINDIR)/$(PLUGINLIBDIR)
+	@cp $(PLUGINLIBDIR)/* $(BINDIR)/$(PLUGINLIBDIR)
+	@mkdir -p $(MANDIR)/man1
+	@mkdir -p $(MANDIR)/man5
 	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
 	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
 	@if [ ! -d $(VIDEODIR) ]; then\
-            mkdir $(VIDEODIR);\
+            mkdir -p $(VIDEODIR);\
             cp *.conf $(VIDEODIR);\
             fi