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

[Hans-Christoph Steiner]

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