Filesystem hierachy standard patch needs review.

Message ID 5049CD8B.2030900@tvdr.de
State New
Headers

Commit Message

Klaus Schmidinger Sept. 7, 2012, 10:33 a.m. UTC
  On 06.09.2012 21:09, Manuel Reimer wrote:
> Klaus Schmidinger wrote:
>> Attached is a revised version of the patch, as I intend to adopt
>> it in version 1.7.30.
>
> Didn't try it, so far, but I had a look at it and maybe, I've found a small problem:
>
> +# By default VDR requires only one single directory to operate:
>   VIDEODIR = /video
> -CONFDIR  = $(VIDEODIR)
> +# See Make.config.template if you want to build VDR according to the FHS ("File system Hierarchy Standard")
>
> [...]
>
> +
> +install-conf:
> +    @cp *.conf $(DESTDIR)$(CONFDIR)
>
>
> For me this seems like "install-conf" does not longer work if FHS is *not* used, as "CONFDIR" is not defined without the FHS mode enabled?

Mabe this would help:



Please let me know if this should be added.

Klaus
  

Comments

Christopher Reimer Sept. 7, 2012, 11:04 a.m. UTC | #1
Am 07.09.2012 12:33, schrieb Klaus Schmidinger:
> On 06.09.2012 21:09, Manuel Reimer wrote:
>> Klaus Schmidinger wrote:
>>> Attached is a revised version of the patch, as I intend to adopt
>>> it in version 1.7.30.
>>
>> Didn't try it, so far, but I had a look at it and maybe, I've found a
>> small problem:
>>
>> +# By default VDR requires only one single directory to operate:
>>   VIDEODIR = /video
>> -CONFDIR  = $(VIDEODIR)
>> +# See Make.config.template if you want to build VDR according to the
>> FHS ("File system Hierarchy Standard")
>>
>> [...]
>>
>> +
>> +install-conf:
>> +    @cp *.conf $(DESTDIR)$(CONFDIR)
>>
>>
>> For me this seems like "install-conf" does not longer work if FHS is
>> *not* used, as "CONFDIR" is not defined without the FHS mode enabled?
>
> Mabe this would help:
>
> --- Makefile    2012/09/01 13:22:33     2.28
> +++ Makefile    2012/09/07 10:31:35
> @@ -76,6 +76,10 @@
>   DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
>   DEFINES += -DLOCDIR=\"$(LOCDIR)\"
>
> +CONFDIR  ?= $(VIDEODIR)
> +CACHEDIR ?= $(VIDEODIR)
> +RESDIR   ?= $(CONFDIR)
> +
>   # The version numbers of VDR and the plugin API (taken from VDR's
> "config.h"):
>
>   VDRVERSION = $(shell sed -ne '/define
> VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
>
>
> Please let me know if this should be added.
>
Hmm, CONFDIR ist already defined in the Makefile.
  
Klaus Schmidinger Sept. 7, 2012, 11:26 a.m. UTC | #2
On 07.09.2012 13:04, Christopher Reimer wrote:
> Am 07.09.2012 12:33, schrieb Klaus Schmidinger:
>> On 06.09.2012 21:09, Manuel Reimer wrote:
>>> Klaus Schmidinger wrote:
>>>> Attached is a revised version of the patch, as I intend to adopt
>>>> it in version 1.7.30.
>>>
>>> Didn't try it, so far, but I had a look at it and maybe, I've found a
>>> small problem:
>>>
>>> +# By default VDR requires only one single directory to operate:
>>>   VIDEODIR = /video
>>> -CONFDIR  = $(VIDEODIR)
>>> +# See Make.config.template if you want to build VDR according to the
>>> FHS ("File system Hierarchy Standard")
>>>
>>> [...]
>>>
>>> +
>>> +install-conf:
>>> +    @cp *.conf $(DESTDIR)$(CONFDIR)
>>>
>>>
>>> For me this seems like "install-conf" does not longer work if FHS is
>>> *not* used, as "CONFDIR" is not defined without the FHS mode enabled?
>>
>> Mabe this would help:
>>
>> --- Makefile    2012/09/01 13:22:33     2.28
>> +++ Makefile    2012/09/07 10:31:35
>> @@ -76,6 +76,10 @@
>>   DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
>>   DEFINES += -DLOCDIR=\"$(LOCDIR)\"
>>
>> +CONFDIR  ?= $(VIDEODIR)
>> +CACHEDIR ?= $(VIDEODIR)
>> +RESDIR   ?= $(CONFDIR)
>> +
>>   # The version numbers of VDR and the plugin API (taken from VDR's
>> "config.h"):
>>
>>   VDRVERSION = $(shell sed -ne '/define
>> VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
>>
>>
>> Please let me know if this should be added.
>>
> Hmm, CONFDIR ist already defined in the Makefile.

Not after vdr-1.7.29-fhs.diff has been applied.
The above addition is meant to be made after applying that patch.

Klaus
  

Patch

--- Makefile    2012/09/01 13:22:33     2.28
+++ Makefile    2012/09/07 10:31:35
@@ -76,6 +76,10 @@ 
  DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
  DEFINES += -DLOCDIR=\"$(LOCDIR)\"

+CONFDIR  ?= $(VIDEODIR)
+CACHEDIR ?= $(VIDEODIR)
+RESDIR   ?= $(CONFDIR)
+
  # The version numbers of VDR and the plugin API (taken from VDR's "config.h"):

  VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)