[Olsr-dev] [PATCH v2 1/1] linux: add support for common (autoconf) make variables (v2)

[Ferry Huberts]

On 07-06-12 18:45, Hans-Christoph Steiner wrote:
>
>
> On 06/07/2012 10:32 AM, Ferry Huberts wrote:
>>
>>
>> On 07-06-12 16:25, Hans-Christoph Steiner wrote:
>>>
>>> On Jun 7, 2012, at 10:17 AM, Ferry Huberts wrote:
>>>
>>>>
>>>>
>>>> On 07-06-12 16:15, Hans-Christoph Steiner wrote:
>>>>>
>>>>> Can you explain what is not working so we can address that issue?
>>>>
>>>> you weren't overriding SHAREDIR
>>>
>>> The last thing I ask of this list to fix my patches, I believe I
>>
>> that's ok.
>> you were quite right to suggest the change, but the patch wasn't
>> completely correct.
>> this is a community so together we can get it correct :-)
>>
>>
>>
>> should be responsible for that. But that means I need to know how to
>> reproduce the problems that others find. I would like to know what went
>> wrong and how I can reproduce it so I can fully address it and test it
>> on all the platforms available to me. Nothing was using SHAREDIR before,
>> is PUD now using it?
>>>
>>
>> Yes, and sgwdynspeed too. They now install their example config files in
>> $(DOCDIR)/olsrd
>>
>> But these changes are still in my local branch (can't push because
>> olsr.org is down)
>
>
> Once you can push those changes, I'll fix up my patch and test it.
>

what's the point of that? I already did that.
For all I care you commit & push that fixed up patch

> .hc
>
>
>
>>
>>> .hc
>>>
>>>
>>>>> .hc
>>>>>
>>>>> On Jun 7, 2012, at 10:06 AM, Ferry Huberts wrote:
>>>>>
>>>>>> Well obviously I disagree with that otherwise I wouldn't have sent
>>>>>> a v2.
>>>>>>
>>>>>> I'll add the mandir back and will submit a v3.
>>>>>>
>>>>>> As I explained earlier, your patch DOES NOT WORK CORRECTLY
>>>>>> (so 'well tested' isn't the complete truth)
>>>>>>
>>>>>> Therefore it really _has_ to be changed.
>>>>>>
>>>>>>
>>>>>> On 07-06-12 15:56, Hans-Christoph Steiner wrote:
>>>>>>>
>>>>>>> The patch as I sent is already well tested.  Making any change
>>>>>>> means testing it all over again.  If there is a problem, I'm happy
>>>>>>> to address it, but otherwise I think the patch should remain the
>>>>>>> same.  I've found this build system to be quite fragile, so even
>>>>>>> small changes like what you propose might cause unintended
>>>>>>> consequences.
>>>>>>>
>>>>>>> .hc
>>>>>>>
>>>>>>> On Jun 7, 2012, at 9:52 AM, Ferry Huberts wrote:
>>>>>>>
>>>>>>>>
>>>>>>>> because MANDIR is derived from SHAREDIR.
>>>>>>>> but we can always put it back.
>>>>>>>>
>>>>>>>> On 07-06-12 15:49, Hans-Christoph Steiner wrote:
>>>>>>>>>
>>>>>>>>> Why did you remove the setting of MANDIR?  Adding SHAREDIR is no
>>>>>>>>> problem.
>>>>>>>>>
>>>>>>>>> .hc
>>>>>>>>>
>>>>>>>>> On Jun 7, 2012, at 8:46 AM, Ferry Huberts wrote:
>>>>>>>>>
>>>>>>>>>> From: Ferry Huberts<(spam-protected)>
>>>>>>>>>>
>>>>>>>>>> Variables: prefix, libdir, sbindir, datarootdir
>>>>>>>>>>
>>>>>>>>>> v1 by Hans-Christoph Steiner
>>>>>>>>>> v2 by Ferry Huberts
>>>>>>>>>>
>>>>>>>>>> Signed-off-by: Ferry Huberts<(spam-protected)>
>>>>>>>>>> ---
>>>>>>>>>> make/Makefile.linux |   15 +++++++++++++--
>>>>>>>>>> 1 file changed, 13 insertions(+), 2 deletions(-)
>>>>>>>>>>
>>>>>>>>>> diff --git a/make/Makefile.linux b/make/Makefile.linux
>>>>>>>>>> index e73be7c..d01b49d 100644
>>>>>>>>>> --- a/make/Makefile.linux
>>>>>>>>>> +++ b/make/Makefile.linux
>>>>>>>>>> @@ -3,8 +3,19 @@
>>>>>>>>>> #
>>>>>>>>>>
>>>>>>>>>> ARCH := $(shell uname -m)
>>>>>>>>>> -DESTDIR ?=
>>>>>>>>>> -LIBDIR =    $(DESTDIR)/usr/lib
>>>>>>>>>> +DESTDIR  ?=
>>>>>>>>>> +
>>>>>>>>>> +# define some common (autoconf) names
>>>>>>>>>> +prefix ?= /usr/local
>>>>>>>>>> +libdir ?= $(prefix)/lib
>>>>>>>>>> +sbindir ?= $(prefix)/sbin
>>>>>>>>>> +datarootdir ?= $(prefix)/share
>>>>>>>>>> +
>>>>>>>>>> +# override (some) target directories and names
>>>>>>>>>> +LIBDIR    = $(DESTDIR)$(libdir)
>>>>>>>>>> +SBINDIR   = $(DESTDIR)$(sbindir)
>>>>>>>>>> +SHAREDIR  = $(DESTDIR)$(datarootdir)
>>>>>>>>>> +
>>>>>>>>>>
>>>>>>>>>> SRCS +=     $(wildcard src/linux/*.c src/unix/*.c)
>>>>>>>>>> HDRS +=        $(wildcard src/linux/*.h src/unix/*.h)
>>>>>>>>>> --
>>>>>>>>>> 1.7.10.2
>>>>>>>>>>
>>>>>>>>
>>>>>>>> --
>>>>>>>> Ferry Huberts
>>>>>>
>>>>>> --
>>>>>> Ferry Huberts
>>>>
>>>> --
>>>> Ferry Huberts
>>

-- 
Ferry Huberts