From cd2ed6cfe750186948a090c47dba42fdaeea8a6a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 16 Feb 2013 11:22:20 +0100
Subject: [PATCH] Added '-p' to the cp command in the install-conf target of
 the Makefile

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

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c9db6525..22ac76ad 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1998,6 +1998,7 @@ Ville Skytt
  for fixing some spellings in osd.h and svdrp.c
  for adding missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin
  for fixing some spellings in PLUGINS.html and Doxyfile
+ for adding '-p' to the cp command in the install-conf target of the Makefile
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 47d6af77..94139d74 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7626,3 +7626,5 @@ Video Disk Recorder Revision History
 - Added missing $(LDFLAGS) to the Makefile of the dvbhddevice plugin (thanks to Ville
   Skyttä).
 - Fixed some spellings in PLUGINS.html and Doxyfile (thanks to Ville Skyttä).
+- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
+  Ville Skyttä).
diff --git a/Makefile b/Makefile
index 47e954fd..94ab132b 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 2.50 2013/01/27 14:19:49 kls Exp $
+# $Id: Makefile 2.51 2013/02/16 11:21:03 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -264,7 +264,7 @@ install-dirs:
 	@mkdir -p $(DESTDIR)$(RESDIR)
 
 install-conf:
-	@cp -n *.conf $(DESTDIR)$(CONFDIR)
+	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
 
 # Documentation: