From 690b9ddfae21018e5698694d0f84d260895579cd Mon Sep 17 00:00:00 2001 From: bmundim Date: Sat, 23 Jul 2011 04:57:30 +0000 Subject: Introduce LAPACK_INSTALL_DIR configuration option. git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LAPACK/trunk@19 c7ba4c71-c2f2-49b2-85d5-cb7b5f04bdfb --- LAPACK.sh | 12 +++++++++++- configuration.ccl | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/LAPACK.sh b/LAPACK.sh index 3c22386..3a1411a 100644 --- a/LAPACK.sh +++ b/LAPACK.sh @@ -57,7 +57,17 @@ if [ -z "${LAPACK_DIR}" -o "${LAPACK_DIR}" = 'BUILD' ]; then NAME=lapack-3.3.1 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${LAPACK_INSTALL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "LAPACK install directory, LAPACK_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "END MESSAGE" + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "LAPACK install directory, LAPACK_INSTALL_DIR, selected. Installing LAPACK at ${LAPACK_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${LAPACK_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} LAPACK_DIR=${INSTALL_DIR} diff --git a/configuration.ccl b/configuration.ccl index 9c1dcfd..452a39b 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,7 +4,7 @@ PROVIDES LAPACK { SCRIPT LAPACK.sh LANG bash - OPTIONS LAPACK_DIR LAPACK_LIBS + OPTIONS LAPACK_DIR LAPACK_INSTALL_DIR LAPACK_LIBS } REQUIRES BLAS -- cgit v1.2.3