From 765927b44a3dd1179865a11cd90e51eec7db0666 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@4054007a-4839-4648-a056-eb81e030d849>
Date: Sat, 1 Nov 2014 00:53:40 +0000
Subject: Update handling standard include/library paths

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenCL/trunk@27 4054007a-4839-4648-a056-eb81e030d849
---
 configure.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.sh b/configure.sh
index 332639a..338b146 100644
--- a/configure.sh
+++ b/configure.sh
@@ -70,15 +70,15 @@ fi
 ################################################################################
 
 # Set options
-if [ "${OPENCL_DIR}" != '/usr' -a "${OPENCL_DIR}" != '/usr/local' ]; then
-    : ${OPENCL_INC_DIRS:=${OPENCL_DIR}/include}
-    : ${OPENCL_LIB_DIRS:=${OPENCL_DIR}/lib}
-fi
+: ${OPENCL_INC_DIRS:=${OPENCL_DIR}/include}
+: ${OPENCL_LIB_DIRS:=${OPENCL_DIR}/lib}
 : ${OPENCL_LIBS:=OpenCL}
 
+OPENCL_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${OPENCL_INC_DIRS})"
+OPENCL_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${OPENCL_LIB_DIRS})"
+
 # Pass options to Cactus
 echo "BEGIN MAKE_DEFINITION"
-echo "HAVE_OPENCL     = 1"
 echo "OPENCL_DIR      = ${OPENCL_DIR}"
 echo "OPENCL_INC_DIRS = ${OPENCL_INC_DIRS}"
 echo "OPENCL_LIB_DIRS = ${OPENCL_LIB_DIRS}"
-- 
cgit v1.2.3