[Olsr-dev] olsrd debian update

[Ferry Huberts]

On 07-06-12 00:04, Hans-Christoph Steiner wrote:
> Can you tell me what didn't get installed properly?   Try this, then you
> can see the results in /tmp/olsrd:
>

I need to think a bit about USRDIR, but for sure SHAREDIR and DOCDIR 
must be overridden

my 'install' is not correct with your patch because I use USRDIR and 
SHAREDIR (this is in my local branch)

I look some more into it tomorrow




>   make OS=linux DESTDIR=/tmp/olsrd install
>
> The packaging should handle setting the paths to what is appropriate for
> that distro/OS, not the olsrd.
>
> .hc
>
> On 06/06/2012 05:57 PM, Ferry Huberts wrote:
>> I think the patch is wrong, comments inline
>
>
>>> commit 44ba87e1013afe9a05d659a40b308525c41d76d5
>>> Author: Hans-Christoph Steiner<(spam-protected)>
>>> Date:   Tue Jun 5 15:53:41 2012 -0400
>>>
>>>      (GNU/Linux build) add support for prefix, libdir, sbindir, etc
>>> vars and set default prefix to /usr/local
>>>
>>> diff --git a/make/Makefile.linux b/make/Makefile.linux
>>> index e73be7c..9972154 100644
>>> --- a/make/Makefile.linux
>>> +++ b/make/Makefile.linux
>>> @@ -3,8 +3,18 @@
>>>   #
>>>
>>>   ARCH := $(shell uname -m)
>>> +
>>>   DESTDIR ?=
>>> -LIBDIR =    $(DESTDIR)/usr/lib
>>> +prefix ?= /usr/local
>>> +libdir ?= $(prefix)/lib
>>> +datarootdir ?= $(prefix)/share
>>> +mandir ?= $(datarootdir)/man
>>> +sbindir ?= $(prefix)/sbin
>>> +
>>> +# the rest are defined in Makefile.inc, but we don't need to override
>>> defaults
>>> +LIBDIR =    $(DESTDIR)$(libdir)
>>> +MANDIR =    $(DESTDIR)$(mandir)
>>> +SBINDIR =    $(DESTDIR)$(sbindir)
>>
>> Why are you overriding only these?
>> The purpose of 'prefix' is to be '/usr/local' for source builds, and
>> '/usr' for packaging build. I think you should override USRDIR for
>> prefix, LIBDIR for libdir, SHAREDIR for datarootdir, MANDIR for mandir,
>> etc.
>> Just take a look in Makefile.inc:
>>
>> <snip>
>> # target directories and names
>> DESTDIR  ?=
>> ETCDIR   ?= $(DESTDIR)/etc
>> USRDIR   ?= $(DESTDIR)/usr
>> LIBDIR   ?= $(USRDIR)/lib
>> SBINDIR  ?= $(USRDIR)/sbin
>> SHAREDIR ?= $(USRDIR)/share
>> DOCDIR   ?= $(SHAREDIR)/doc
>> MANDIR   ?= $(SHAREDIR)/man
>> EXENAME  ?= olsrd
>> CFGNAME  ?= $(EXENAME).conf
>> CFGFILE  ?= $(ETCDIR)/$(CFGNAME)
>> <snip>
>>
>>
>>
>> With this patch, you're missing at least SHAREDIR, DOCDIR, MANDIR
>>
>>
>> So, sorry but this is a NAK from me.
>>
>>>
>>>   SRCS +=     $(wildcard src/linux/*.c src/unix/*.c)
>>>   HDRS +=        $(wildcard src/linux/*.h src/unix/*.h)
>>
>>

-- 
Ferry Huberts