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

[Ferry Huberts]

From: Ferry Huberts <(spam-protected)>

Signed-off-by: Ferry Huberts <(spam-protected)>
---
 lib/pud/wireformat-java/Makefile |   10 ++++++----
 lib/pud/wireformat/Makefile      |    8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/pud/wireformat-java/Makefile b/lib/pud/wireformat-java/Makefile
index c270e0d..77a7e34 100644
--- a/lib/pud/wireformat-java/Makefile
+++ b/lib/pud/wireformat-java/Makefile
@@ -22,12 +22,14 @@ DEBUGBOOLEAN = false
 endif
 
 MACHINE=$(shell uname -m)
-ifeq ($(strip $(MACHINE)),x86_64)
-LIBDIR_INSTALL = usr/lib64
-ARCH=.$(MACHINE)
-else
 LIBDIR_INSTALL = usr/lib
 ARCH=
+ifeq ($(strip $(MACHINE)),x86_64)
+  LIB64DIR := $(shell test -d "/usr/lib64" && echo "YES")
+  ifeq ($(strip $(LIB64DIR)),YES)
+    LIBDIR_INSTALL = usr/lib64
+    ARCH=.$(MACHINE)
+  endif
 endif
 
 
diff --git a/lib/pud/wireformat/Makefile b/lib/pud/wireformat/Makefile
index 6f39055..b58e32d 100644
--- a/lib/pud/wireformat/Makefile
+++ b/lib/pud/wireformat/Makefile
@@ -13,10 +13,12 @@ include $(TOPDIR)/Makefile.inc
 ######################
 
 MACHINE=$(shell uname -m)
-ifeq ($(strip $(MACHINE)),x86_64)
-LIBDIR_INSTALL = usr/lib64
-else
 LIBDIR_INSTALL = usr/lib
+ifeq ($(strip $(MACHINE)),x86_64)
+  LIB64DIR := $(shell test -d "/usr/lib64" && echo "YES")
+  ifeq ($(strip $(LIB64DIR)),YES)
+    LIBDIR_INSTALL = usr/lib64
+  endif
 endif
 
 
-- 
1.7.7.6