From 99417bf1652284935a455bf6045b0b42b47467a8 Mon Sep 17 00:00:00 2001
From: bmundim <bmundim@9e23cc15-e5c8-4d65-9080-beda90ea645b>
Date: Sat, 23 Jul 2011 04:54:38 +0000
Subject: Introduce GSL_INSTALL_DIR as a configuration option.

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/GSL/trunk@19 9e23cc15-e5c8-4d65-9080-beda90ea645b
---
 GSL.sh            | 12 +++++++++++-
 configuration.ccl |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/GSL.sh b/GSL.sh
index ae80640..1bee624 100644
--- a/GSL.sh
+++ b/GSL.sh
@@ -61,7 +61,17 @@ if [ -z "${GSL_DIR}" -o "${GSL_DIR}" = 'BUILD' ]; then
     NAME=gsl-1.14
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
-    INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    if [ -z "${GSL_INSTALL_DIR}" ]; then
+        echo "BEGIN MESSAGE"
+        echo "GSL install directory, GSL_INSTALL_DIR, not set. Installing in the default configuration location. "
+        echo "END MESSAGE"
+     INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    else
+        echo "BEGIN MESSAGE"
+        echo "GSL install directory, GSL_INSTALL_DIR, selected. Installing GSL at ${GSL_INSTALL_DIR} "
+        echo "END MESSAGE"
+     INSTALL_DIR=${GSL_INSTALL_DIR}
+    fi
     DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
     GSL_DIR=${INSTALL_DIR}
     
diff --git a/configuration.ccl b/configuration.ccl
index 25be2cc..2f7130f 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,5 +4,5 @@ PROVIDES GSL
 {
   SCRIPT GSL.sh
   LANG bash
-  OPTIONS GSL_DIR GSL_LIBS
+  OPTIONS GSL_DIR GSL_INSTALL_DIR GSL_LIBS
 }
-- 
cgit v1.2.3