diff options
| -rw-r--r-- | configuration.ccl | 2 | ||||
| -rw-r--r-- | configure.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configuration.ccl b/configuration.ccl index a2923c9..1536fc5 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,5 +4,5 @@ PROVIDES MPI { SCRIPT configure.sh LANG bash - OPTIONS MPI OPENMPI_DIR OPENMPI_INC_DIRS OPENMPI_LIB_DIRS OPENMPI_LIBS + OPTIONS MPI OPENMPI_DIR OPENMPI_INSTALL_DIR OPENMPI_INC_DIRS OPENMPI_LIB_DIRS OPENMPI_LIBS } diff --git a/configure.sh b/configure.sh index 34d9218..b2eff4a 100644 --- a/configure.sh +++ b/configure.sh @@ -74,7 +74,14 @@ if [ -z "${OPENMPI_DIR}" -o "${OPENMPI_DIR}" = 'BUILD' ]; then NAME=openmpi-1.5.3 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${OPENMPI_INSTALL_DIR}"]; then + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "Installing OpenMPI into ${OPENMPI_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${OPENMPI_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} OPENMPI_DIR=${INSTALL_DIR} |