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

Ferry Huberts (spam-protected)
Thu Jun 7 15:52:53 CEST 2012



On 07-06-12 15:49, Hans-Christoph Steiner wrote:
>
> Why did you remove the setting of MANDIR?  Adding SHAREDIR is no problem.

because MANDIR is derived from SHAREDIR.
but we can always put it back.

>
> .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




More information about the Olsr-dev mailing list