channels.conf overwritten when installing vdr 1.7.30

Message ID 5073E205.1010802@tvdr.de
State New
Headers

Commit Message

Klaus Schmidinger Oct. 9, 2012, 8:36 a.m. UTC
  On 08.10.2012 21:47, Peter Münster wrote:
> On Mon, Oct 08 2012, Klaus Schmidinger wrote:
>
>> +install-conf:
>> +       @cp *.conf $(DESTDIR)$(CONFDIR)
>
> What about "@cp -n"?

Sounds like the right thing to do:

---------------------------------------------------------------
---------------------------------------------------------------


Klaus
  

Patch

--- Makefile    2012/09/07 14:11:37     2.29
+++ Makefile    2012/10/09 08:32:25
@@ -211,7 +211,7 @@ 
         @mkdir -p $(DESTDIR)$(RESDIRDEF)

  install-conf:
-       @cp *.conf $(DESTDIR)$(CONFDIRDEF)
+       @cp -n *.conf $(DESTDIR)$(CONFDIRDEF)


  # Documentation: