aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbmundim <bmundim@53307013-940b-43fa-b11d-2c2b05dfe90d>2011-07-23 04:53:12 +0000
committerbmundim <bmundim@53307013-940b-43fa-b11d-2c2b05dfe90d>2011-07-23 04:53:12 +0000
commit1c84bf0bc6f774db898961fec20e1fabd91399a7 (patch)
tree17b5ee8d7a126086a1e644718ce7e82aa427e611
parent3c2acf94c9dd0030d2fc81a641986f8a0e919fd2 (diff)
Introduce BLAS_INSTALL_DIR configuration option.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/BLAS/trunk@18 53307013-940b-43fa-b11d-2c2b05dfe90d
-rw-r--r--BLAS.sh12
-rw-r--r--configuration.ccl2
2 files changed, 12 insertions, 2 deletions
diff --git a/BLAS.sh b/BLAS.sh
index 613828a..b2f0ebd 100644
--- a/BLAS.sh
+++ b/BLAS.sh
@@ -58,7 +58,17 @@ if [ -z "${BLAS_DIR}" -o "${BLAS_DIR}" = 'BUILD' ]; then
TARNAME=lapack-3.3.1
SRCDIR=$(dirname $0)
BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
- INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+ if [ -z "${BLAS_INSTALL_DIR}" ]; then
+ echo "BEGIN MESSAGE"
+ echo "BLAS install directory, BLAS_INSTALL_DIR, not set. Installing in the default configuration location. "
+ echo "END MESSAGE"
+ INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+ else
+ echo "BEGIN MESSAGE"
+ echo "BLAS install directory, BLAS_INSTALL_DIR, selected. Installing BLAS at ${BLAS_INSTALL_DIR} "
+ echo "END MESSAGE"
+ INSTALL_DIR=${BLAS_INSTALL_DIR}
+ fi
DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
BLAS_DIR=${INSTALL_DIR}
diff --git a/configuration.ccl b/configuration.ccl
index ba23870..30b30af 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,5 +4,5 @@ PROVIDES BLAS
{
SCRIPT BLAS.sh
LANG bash
- OPTIONS BLAS_DIR BLAS_LIBS
+ OPTIONS BLAS_DIR BLAS_INSTALL_DIR BLAS_LIBS
}