[Olsr-dev] [PATCH v2 1/2] linux: use /usr/lib64 on 64bit machines if it exists

[Henning Rogge]

On 05/11/2012 09:36 AM, Ferry Huberts wrote:
>
>
> On 11-05-12 08:01, Henning Rogge wrote:
>> On 05/10/2012 10:04 PM, Ferry Huberts wrote:
>>> On 10-05-12 21:47, Ferry Huberts wrote:
>>>> From: Ferry Huberts<(spam-protected)>
>>>>
>>>> Signed-off-by: Ferry Huberts<(spam-protected)>
>>>> ---
>>>> make/Makefile.linux | 8 +++++++-
>>>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>>>
>>>> diff --git a/make/Makefile.linux b/make/Makefile.linux
>>>> index e73be7c..fa729ba 100644
>>>> --- a/make/Makefile.linux
>>>> +++ b/make/Makefile.linux
>>>> @@ -4,7 +4,13 @@
>>>>
>>>> ARCH := $(shell uname -m)
>>>> DESTDIR ?=
>>>> -LIBDIR = $(DESTDIR)/usr/lib
>>>> +LIBDIR = $(DESTDIR)/usr/lib
>>>> +ifeq ($(strip $(ARCH)),x86_64)
>>>> + LIB64DIR := $(shell test -d "/usr/lib64"&& echo "YES")
>>>> + ifeq ($(strip $(LIB64DIR)),YES)
>>>> + LIBDIR = /usr/lib64
>>>
>>> damn, a typo here. must stop working now...
>>> > + LIBDIR = $(DESTDIR)/usr/lib64
>>
>> and the shell test must be changed too... I wonder if its worth the
>
> You mean the 'no space before the &&'? That appears to have been deleted
> by accident by me, it's there in the original patch.

$(shell test -d "/usr/lib64"&& echo "YES")

should be

$(shell test -d "$(DESTDIR)/usr/lib64"&& echo "YES")

I think.

>> effort, is there any distribution that does not have the /usr/lib
>> directory?
>>
>
> Yes, _all_ Red Hat/Fedora variants
>
> The point is that these distributions are true multi-arch and separate
> their 32 and 64 bit libraries by means of these directories.
> Always using /usr/lib would prevent simultaneous install of both
> versions of a library, and does not comply with their guidelines.
>
> I'm going to push these patches, any more comments?

what do you think about the version without the "if" ?

LIBDIRSUFFIX := $(shell test -d "$(DESTDIR)/usr/lib64" && echo "64")
LIBDIR = $(DESTDIR)/usr/lib$(LIBDIRSUFFIX)

Henning Rogge
-- 
Diplom-Informatiker Henning Rogge , Fraunhofer-Institut für
Kommunikation, Informationsverarbeitung und Ergonomie FKIE
Kommunikationssysteme (KOM)
Neuenahrer Straße 20, 53343 Wachtberg, Germany
Telefon +49 228 9435-961,   Fax +49 228 9435 685
mailto:(spam-protected) http://www.fkie.fraunhofer.de
GPG: E1C6 0914 490B 3909 D944 F80D 4487 C67C 55EC CFE0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6156 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.olsr.org/pipermail/olsr-dev/attachments/20120511/55c32fe8/attachment.bin>