summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-10-09 08:34:57 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-10-09 08:34:57 +0200
commit6b6a372244fc27ebb8c078686db709deae8be9ea (patch)
tree504bc9839b422cb4650c71604e4bc9849e826e6f
parent43883ee15977ef021bcf747012133e0514243c38 (diff)
downloadvdr-6b6a372244fc27ebb8c078686db709deae8be9ea.tar.gz
vdr-6b6a372244fc27ebb8c078686db709deae8be9ea.tar.bz2
Fixed 'make install' to not overwrite existing configuration files
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY2
-rw-r--r--Makefile4
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 814441bf..841d4a1e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2965,3 +2965,6 @@ Sören Moch <smoch@web.de>
for a patch that was used to move cleaning up the EPG data and writing the epg.data
file into a separate thread to avoid sluggish response to user input on slow systems
for fixing sorting folders before recordings in case of UTF-8
+
+Peter Münster <pmlists@free.fr>
+ for fixing 'make install' to not overwrite existing configuration files
diff --git a/HISTORY b/HISTORY
index e7192cad..34223edd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7290,3 +7290,5 @@ Video Disk Recorder Revision History
Removed the meanwhile obsolete definition of FE_CAN_TURBO_FEC.
- Fixed some compiler warnings under gcc version 4.7.1.
- Fixed setting the video format in the dvbhdffdevice (thanks to Torsten Lang).
+- Fixed 'make install' to not overwrite existing configuration files (thanks to Peter
+ Münster).
diff --git a/Makefile b/Makefile
index 9c9fe9fb..e165ee88 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.29 2012/09/09 09:29:15 kls Exp $
+# $Id: Makefile 2.30 2012/10/09 08:32:25 kls Exp $
.DELETE_ON_ERROR:
@@ -211,7 +211,7 @@ install-dirs:
@mkdir -p $(DESTDIR)$(RESDIRDEF)
install-conf:
- @cp *.conf $(DESTDIR)$(CONFDIRDEF)
+ @cp -n *.conf $(DESTDIR)$(CONFDIRDEF)
# Documentation: