diff options
| author | eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2014-11-01 00:52:42 +0000 |
|---|---|---|
| committer | eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2014-11-01 00:52:42 +0000 |
| commit | 80b68cf6e6598d823ceac251ac51e499dded1b3a (patch) | |
| tree | f766a6ea4ba930db8ba70c383fa2f2602430374c | |
| parent | 0d747a37aebae47e4c156415d3d238e1b3b1a208 (diff) | |
Update handling standard include/library paths
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@58 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
| -rw-r--r-- | configure.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.sh b/configure.sh index cc27116..51ce117 100644 --- a/configure.sh +++ b/configure.sh @@ -59,7 +59,7 @@ then # Set locations THORN=LORENE NAME=Lorene - SRCDIR=$(dirname $0) + SRCDIR="$(dirname $0)" BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${LORENE_INSTALL_DIR}" ]; then INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} @@ -226,14 +226,16 @@ LORENE_INC_DIRS="${LORENE_DIR}/Export/C++/Include ${LORENE_DIR}/C++/Include" LORENE_LIB_DIRS="${LORENE_DIR}/Lib ${LORENE_EXTRA_LIB_DIRS}" LORENE_LIBS="lorene_export lorene lorenef77 ${LORENE_EXTRA_LIBS}" +LORENE_INC_DIRS="$(${CCTK_HOME}/lib/sbin/strip-incdirs.sh ${LORENE_INC_DIRS})" +LORENE_LIB_DIRS="$(${CCTK_HOME}/lib/sbin/strip-libdirs.sh ${LORENE_LIB_DIRS})" + # Pass options to Cactus echo "BEGIN MAKE_DEFINITION" -echo "HAVE_LORENE = 1" echo "LORENE_DIR = ${LORENE_DIR}" echo "LORENE_INC_DIRS = ${LORENE_INC_DIRS}" echo "LORENE_LIB_DIRS = ${LORENE_LIB_DIRS}" echo "LORENE_LIBS = ${LORENE_LIBS}" -echo "HOME_LORENE = ${LORENE_DIR}" +# echo "HOME_LORENE = ${LORENE_DIR}" echo "END MAKE_DEFINITION" echo 'INCLUDE_DIRECTORY $(LORENE_INC_DIRS)' |