frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed 'make install' to not overwrite existing configuration files

This commit is contained in:
Klaus Schmidinger 2012-10-09 08:34:57 +02:00
parent 43883ee159
commit 6b6a372244
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -2965,3 +2965,6 @@ S
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

2
HISTORY
View File

@ -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).

4
Makefile
View File

@ -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: