From 04ddd739bf410ff5b745728083f624a7b9949397 Mon Sep 17 00:00:00 2001
From: bmundim <bmundim@fb53df36-e548-4a1e-8150-ab98cbd5e786>
Date: Tue, 5 May 2015 16:32:59 +0000
Subject: Define multiarch library directory.

See discussions at https://trac.einsteintoolkit.org/ticket/1769



git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@103 fb53df36-e548-4a1e-8150-ab98cbd5e786
---
 src/detect.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/detect.sh b/src/detect.sh
index 7bef01a..7fbe2dd 100755
--- a/src/detect.sh
+++ b/src/detect.sh
@@ -158,10 +158,19 @@ fi
 # Check for additional libraries
 ################################################################################
 
+# Set library directory name for machine architecture:
+gcc -dumpversion > /dev/null 2>&1
+
+if [ $? -eq 0 ]; then
+  MACHINE=${MACHINE:=`gcc -dumpmachine`}
+else
+  MACHINE=${MACHINE:=""}
+fi
+
 # Set options
 # Fortran modules may be located in the lib directory
-HDF5_INC_DIRS="${HDF5_DIR}/include ${HDF5_DIR}/lib"
-HDF5_LIB_DIRS="${HDF5_DIR}/lib"
+HDF5_INC_DIRS="${HDF5_DIR}/include ${HDF5_DIR}/lib/${MACHINE} ${HDF5_DIR}/lib"
+HDF5_LIB_DIRS="${HDF5_DIR}/lib/${MACHINE} ${HDF5_DIR}/lib"
 HDF5_LIBS="${HDF5_CXX_LIBS} ${HDF5_FORTRAN_LIBS} ${HDF5_C_LIBS}"
 
 
-- 
cgit v1.2.3