diff options
| author | bmundim <bmundim@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2011-07-23 04:59:54 +0000 |
|---|---|---|
| committer | bmundim <bmundim@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2011-07-23 04:59:54 +0000 |
| commit | b2d073a718faab1a67ac59a213a69f8e3a2cd3ff (patch) | |
| tree | 42ed36e9df0e8210c12741119e6b66b4c7e833b8 | |
| parent | 8864be210f14507d23282b2e795a74d0065612a7 (diff) | |
Introducing LORENE_INSTALL_DIR configuration option.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@29 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
| -rw-r--r-- | LORENE.sh | 12 | ||||
| -rw-r--r-- | configuration.ccl | 2 |
2 files changed, 12 insertions, 2 deletions
@@ -40,7 +40,17 @@ if [ -z "${LORENE_DIR}" -o "${LORENE_DIR}" = 'BUILD' ]; then NAME=Lorene SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${LORENE_INSTALL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "LORENE install directory, LORENE_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "END MESSAGE" + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "LORENE install directory, LORENE_INSTALL_DIR, selected. Installing LORENE at ${LORENE_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${LORENE_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} LORENE_DIR=${INSTALL_DIR} diff --git a/configuration.ccl b/configuration.ccl index 50c9e9b..ecfbf8c 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,7 +4,7 @@ PROVIDES LORENE { SCRIPT LORENE.sh LANG bash - OPTIONS LORENE_DIR LORENE_EXTRA_LIB_DIRS LORENE_EXTRA_LIBS + OPTIONS LORENE_DIR LORENE_INSTALL_DIR LORENE_EXTRA_LIB_DIRS LORENE_EXTRA_LIBS } REQUIRES LAPACK BLAS GSL |