diff options
| author | bmundim <bmundim@091d3ff0-52bc-4db5-b7a6-18201e4c0cca> | 2011-07-23 05:00:57 +0000 |
|---|---|---|
| committer | bmundim <bmundim@091d3ff0-52bc-4db5-b7a6-18201e4c0cca> | 2011-07-23 05:00:57 +0000 |
| commit | a2682b15c04f7f6893d2bb7f22d49905f49c6292 (patch) | |
| tree | 701d1e7a6c54495175c33905ab4376f92df5c8a7 | |
| parent | d082f6a99761a067111e26f16f04d355e21b43c4 (diff) | |
Introducing OPENSSL_INSTALL_DIR configuration option.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@19 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
| -rw-r--r-- | OpenSSL.sh | 12 | ||||
| -rw-r--r-- | configuration.ccl | 1 |
2 files changed, 12 insertions, 1 deletions
@@ -61,7 +61,17 @@ if [ -z "${OPENSSL_DIR}" -o "${OPENSSL_DIR}" = 'BUILD' ]; then NAME=openssl-1.0.0d SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${OPENSSL_INSTALL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "OPENSSL install directory, OPENSSL_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "END MESSAGE" + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "OPENSSL install directory, OPENSSL_INSTALL_DIR, selected. Installing OPENSSL at ${OPENSSL_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${OPENSSL_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} OPENSSL_DIR=${INSTALL_DIR} diff --git a/configuration.ccl b/configuration.ccl index 0439b0a..ee6847d 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,4 +4,5 @@ PROVIDES OpenSSL { SCRIPT OpenSSL.sh LANG bash + OPTIONS OPENSSL_INSTALL_DIR } |