summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-08-20 10:46:02 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-08-20 10:46:02 +0200
commita7c99052363e3738ebf8744f84b7a4b8b44f6d35 (patch)
tree304c6994a5b71a54337d2ee98d0d4e30dceb3fa4
parentef01c6d8bbce8aea091191c6073ab55ff2cd041e (diff)
downloadvdr-a7c99052363e3738ebf8744f84b7a4b8b44f6d35.tar.gz
vdr-a7c99052363e3738ebf8744f84b7a4b8b44f6d35.tar.bz2
Added --remove-destination to the 'cp' command for binaries in the Makefile
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY3
-rw-r--r--Makefile6
3 files changed, 8 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 825af8a4..ea619ca9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1809,6 +1809,8 @@ Gavin Hamill <gdh@acentral.co.uk>
Petri Hintukainen <Petri.Hintukainen@hut.fi>
for suggesting to disable the use of "fadvise" in cUnbufferedFile because there
have been several reports that it causes more problems than it solves
+ for suggesting to add --remove-destination to the 'cp' command for binaries in
+ the Makefile to avoid a crash in case a new version is installed on a running system
Marcel Schaeben <mts280@gmx.de>
for his "Easy Input" patch
diff --git a/HISTORY b/HISTORY
index d04d3584..c221b8ad 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4883,3 +4883,6 @@ Video Disk Recorder Revision History
which caused long switching times or completely blank screens when switching
between encrypted channels on the same transponder (reported by Tomas Berglund).
- Adapted cThread::ThreadId() to recent kernels (thanks to Ville Skyttä).
+- Added --remove-destination to the 'cp' command for binaries in the Makefile to
+ avoid a crash in case a new version is installed on a running system (suggested
+ by Petri Hintukainen).
diff --git a/Makefile b/Makefile
index 0a3dffac..1d73b79d 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 1.94 2006/06/02 14:45:33 kls Exp $
+# $Id: Makefile 1.95 2006/08/20 10:44:22 kls Exp $
.DELETE_ON_ERROR:
@@ -201,7 +201,7 @@ install: install-bin install-conf install-doc install-plugins
install-bin: vdr
@mkdir -p $(BINDIR)
- @cp vdr runvdr $(BINDIR)
+ @cp --remove-destination vdr runvdr $(BINDIR)
# Configuration files:
@@ -223,7 +223,7 @@ install-doc:
install-plugins: plugins
@mkdir -p $(PLUGINLIBDIR)
- @cp $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
+ @cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
# Source documentation: