From ae2760e7f4c8387eea90980856710e29b7991c96 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@c7ba4c71-c2f2-49b2-85d5-cb7b5f04bdfb>
Date: Sat, 1 Nov 2014 00:52:24 +0000
Subject: Update handling standard include/library paths

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LAPACK/trunk@51 c7ba4c71-c2f2-49b2-85d5-cb7b5f04bdfb
---
 configure.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.sh b/configure.sh
index 4c6c942..f7cb94d 100644
--- a/configure.sh
+++ b/configure.sh
@@ -76,7 +76,7 @@ then
     # Set locations
     THORN=LAPACK
     NAME=lapack-3.4.2
-    SRCDIR=$(dirname $0)
+    SRCDIR="$(dirname $0)"
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${LAPACK_INSTALL_DIR}" ]; then
         INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
@@ -184,17 +184,17 @@ fi
 ################################################################################
 
 # Set options
-if [ "${LAPACK_DIR}" != '/usr/lib' -a "${LAPACK_DIR}" != '/usr/local/lib' -a \
-     "${LAPACK_DIR}" != 'NO_BUILD' ]
-then
+if [ "${LAPACK_DIR}" != 'NO_BUILD' ]; then
     : ${LAPACK_INC_DIRS=}
     : ${LAPACK_LIB_DIRS="${LAPACK_DIR}"}
 fi
 : ${LAPACK_LIBS='lapack'}
 
+LAPACK_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${LAPACK_INC_DIRS})"
+LAPACK_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${LAPACK_LIB_DIRS})"
+
 # Pass options to Cactus
 echo "BEGIN MAKE_DEFINITION"
-echo "HAVE_LAPACK     = 1"
 echo "LAPACK_DIR      = ${LAPACK_DIR}"
 echo "LAPACK_INC_DIRS = ${LAPACK_INC_DIRS}"
 echo "LAPACK_LIB_DIRS = ${LAPACK_LIB_DIRS}"
-- 
cgit v1.2.3