[vdr] channels.conf overwritten when installing vdr 1.7.30

[Klaus Schmidinger]

On 07.10.2012 18:27, Joachim Wilke wrote:
> Dear all,
>
> I just upgraded vdr from 1.7.29 to 1.7.31. After that I noticed that I lost my channels.conf as it was overwritten by "make install". :-(
> A closer look to the changes made in 1.7.30 revealed that install-conf target in the Makefile no longer checks if the CONFDIR already exists. In previous version *.conf-files where only installed once (when the CONFDIR just was created).
>
> Was this change made by intention?

This was part of the patch that introduced FHS compatibility:

---------------------------------------------------------------------------
--- ./Makefile  2012/04/15 13:21:31     2.27
+++ ./Makefile  2012/09/01 13:22:33
...
@@ -193,12 +198,15 @@

  # Configuration files:

-install-conf:
+install-dirs:
         @mkdir -p $(DESTDIR)$(VIDEODIR)
-       @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
-           mkdir -p $(DESTDIR)$(CONFDIR);\
-           cp *.conf $(DESTDIR)$(CONFDIR);\
-           fi
+       @mkdir -p $(DESTDIR)$(CONFDIR)
+       @mkdir -p $(DESTDIR)$(CACHEDIR)
+       @mkdir -p $(DESTDIR)$(RESDIR)
+
+install-conf:
+       @cp *.conf $(DESTDIR)$(CONFDIR)
+

  # Documentation:

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

Whether this was the intention of the patch author is beyond me.
Since personally I don't "install" VDR and run it with only a single
directory, I pretty much accept Makefile patches regarding installation
"as is". So if you have a suggestion on how to fix this, let's have it!

Klaus