Changed installing config files to handle potentially broken 'cp -n'

This commit is contained in:
Klaus Schmidinger 2024-01-05 14:16:16 +01:00
parent 05f03d6e38
commit eb35faaf7d
2 changed files with 11 additions and 2 deletions

View File

@ -9862,3 +9862,7 @@ Video Disk Recorder Revision History
formatted string with all the available frame data.
- The recording info of the default skins now shows the frame parameters of the
recording at the end of the description (if such information is available).
2024-01-05:
- Changed installing config files to handle potentially broken 'cp -n'.

View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: Makefile 5.1 2020/12/31 11:11:53 kls Exp $
# $Id: Makefile 5.2 2024/01/05 14:16:16 kls Exp $
.DELETE_ON_ERROR:
@ -300,7 +300,12 @@ install-dirs:
@mkdir -p $(DESTDIR)$(RESDIR)
install-conf: install-dirs
@cp -pn *.conf $(DESTDIR)$(CONFDIR)
# 'cp -n' may be broken, so let's do it the hard way
@for i in *.conf; do\
if ! [ -e $(DESTDIR)$(CONFDIR)/$$i ] ; then\
cp -p $$i $(DESTDIR)$(CONFDIR);\
fi\
done
# Documentation: