diff options
| author | bmundim <bmundim@325d7946-0b50-4e3b-902a-3a8d69fbdfa6> | 2011-09-27 16:50:52 +0000 |
|---|---|---|
| committer | bmundim <bmundim@325d7946-0b50-4e3b-902a-3a8d69fbdfa6> | 2011-09-27 16:50:52 +0000 |
| commit | b398c99e1642af9e8135586f3cd1082e8480718c (patch) | |
| tree | 3c58b65ab1682ff802b3b4550f1aa032c88e1fa9 | |
| parent | d8420c2786a0f287c335257e4af0147554a74f45 (diff) | |
Allow INSTALL_DIR to be set by the user (see discussion on Trac Ticket #136)
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/FFTW3/trunk@2 325d7946-0b50-4e3b-902a-3a8d69fbdfa6
| -rw-r--r-- | FFTW3.sh | 12 | ||||
| -rw-r--r-- | configuration.ccl | 2 |
2 files changed, 12 insertions, 2 deletions
@@ -61,7 +61,17 @@ if [ -z "${FFTW3_DIR}" -o "${FFTW3_DIR}" = 'BUILD' ]; then NAME=fftw-3.2.2 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${FFTW3_INSTALL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "FFTW3 install directory, FFTW3_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "END MESSAGE" + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "FFTW3 install directory, FFTW3_INSTALL_DIR, selected. Installing FFTW3 at ${FFTW3_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${FFTW3_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} FFTW3_DIR=${INSTALL_DIR} diff --git a/configuration.ccl b/configuration.ccl index 12d5553..83e9ddb 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,5 +4,5 @@ PROVIDES FFTW3 { SCRIPT FFTW3.sh LANG bash - OPTIONS FFTW3_DIR FFTW3_LIBS + OPTIONS FFTW3_DIR FFTW3_INSTALL_DIR FFTW3_LIBS } |