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

Ferry Huberts (spam-protected)
Thu May 10 21:47:47 CEST 2012


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
+  endif
+endif
 
 SRCS += 	$(wildcard src/linux/*.c src/unix/*.c)
 HDRS +=		$(wildcard src/linux/*.h src/unix/*.h)
-- 
1.7.7.6





More information about the Olsr-dev mailing list