From b2d073a718faab1a67ac59a213a69f8e3a2cd3ff Mon Sep 17 00:00:00 2001
From: bmundim <bmundim@5c1b1641-b641-47ec-b3d9-0f93d4c445ee>
Date: Sat, 23 Jul 2011 04:59:54 +0000
Subject: Introducing LORENE_INSTALL_DIR configuration option.

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@29 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
---
 LORENE.sh         | 12 +++++++++++-
 configuration.ccl |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/LORENE.sh b/LORENE.sh
index 70f6278..08ea465 100644
--- a/LORENE.sh
+++ b/LORENE.sh
@@ -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
-- 
cgit v1.2.3