Introduce LIBJPEG_INSTALL_DIR configuration option.

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/libjpeg/trunk@10 ba58616d-3abc-4c77-8745-3ba8ad4a582f

2 files changed, 12 insertions, 1 deletions

diff --git a/configuration.ccl b/configuration.ccl
index 5eea0a0..77d6354 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -4,4 +4,5 @@ PROVIDES libjpeg
 {
   SCRIPT libjpeg.sh
   LANG bash
+  OPTIONS LIBJPEG_INSTALL_DIR
 }
diff --git a/libjpeg.sh b/libjpeg.sh
index d248e72..442458d 100755
--- a/libjpeg.sh
+++ b/libjpeg.sh
@@ -24,7 +24,17 @@ if [ -z "${LIBJPEG_DIR}" -o "${LIBJPEG_DIR}" = 'BUILD' ]; then
     NAME=jpeg-8c
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
-    INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    if [ -z "${LIBJPEG_INSTALL_DIR}" ]; then
+        echo "BEGIN MESSAGE"
+        echo "LIBJPEG install directory, LIBJPEG_INSTALL_DIR, not set. Installing in the default configuration location. "
+        echo "END MESSAGE"
+     INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN}
+    else
+        echo "BEGIN MESSAGE"
+        echo "LIBJPEG install directory, LIBJPEG_INSTALL_DIR, selected. Installing LIBJPEG at ${LIBJPEG_INSTALL_DIR} "
+        echo "END MESSAGE"
+     INSTALL_DIR=${LIBJPEG_INSTALL_DIR}
+    fi
     DONE_FILE=${SCRATCH_BUILD}/done/${THORN}
     LIBJPEG_DIR=${INSTALL_DIR}