From c5277df361f49093bbf9874e2d2abdcdeee3e630 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 5 May 2019 13:35:56 +0200
Subject: Fixed the install target in case of multiple jobs

---
 CONTRIBUTORS | 1 +
 HISTORY      | 3 ++-
 Makefile     | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c7f974c2..c3a776ec 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3128,6 +3128,7 @@ Chris Mayo <aklhfex@gmail.com>
  for updating links in the INSTALL file
  for reporting double slashes in file names processed with AddDirectory()
  for using the 'example' macro in vdr.5
+ for fixing the install target in case of multiple jobs
 
 Dominic Evans <oldmanuk@gmail.com>
  for making the SVDRP command LSTC accepts channel IDs
diff --git a/HISTORY b/HISTORY
index b862a0d9..847d09e5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History
   Senzel).
 - Official release.
 
-2019-03-19: Version 2.4.1
+2019-05-05: Version 2.4.1
 
 - Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
   by Johann Friedrichs).
@@ -9393,3 +9393,4 @@ Video Disk Recorder Revision History
 - Now touching the .update file in the video directory after removing deleted
   recordings, so that other VDRs that use the same video directory will update their
   list of (deleted) recordings and thus won't display too much empty disk space.
+- Fixed the install target in case of multiple jobs (thanks to Chris Mayo).
diff --git a/Makefile b/Makefile
index a13214a6..b1be3011 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 4.5 2017/05/29 08:48:42 kls Exp $
+# $Id: Makefile 4.6 2019/05/05 13:31:56 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -271,7 +271,7 @@ clean-plugins: vdr.pc
 
 # Install the files (note that 'install-pc' must be first!):
 
-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
+install: install-pc install-bin install-conf install-doc install-plugins install-i18n install-includes
 
 # VDR binary:
 
@@ -288,7 +288,7 @@ install-dirs:
 	@mkdir -p $(DESTDIR)$(CACHEDIR)
 	@mkdir -p $(DESTDIR)$(RESDIR)
 
-install-conf:
+install-conf: install-dirs
 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
 
 # Documentation:
-- 
cgit v1.2.3