diff options
| author | bmundim <bmundim@d47fded2-66c1-406f-af09-4fc0800f9c6b> | 2011-07-23 05:02:01 +0000 |
|---|---|---|
| committer | bmundim <bmundim@d47fded2-66c1-406f-af09-4fc0800f9c6b> | 2011-07-23 05:02:01 +0000 |
| commit | 14883019860557b656144dcb186995e8b7afcd11 (patch) | |
| tree | 1b6b6fd9ca940d68d7322388d275c8d08e274123 | |
| parent | 625fba01fecf0539ff81d8f2969a226a80b17cda (diff) | |
Introducing ZLIB_INSTALL_DIR configuration option.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/zlib/trunk@5 d47fded2-66c1-406f-af09-4fc0800f9c6b
| -rw-r--r-- | configuration.ccl | 2 | ||||
| -rw-r--r-- | zlib.sh | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/configuration.ccl b/configuration.ccl index ad6a6ed..9965dcf 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,5 +4,5 @@ PROVIDES zlib { SCRIPT zlib.sh LANG bash - OPTIONS ZLIB_DIR + OPTIONS ZLIB_DIR ZLIB_INSTALL_DIR } @@ -61,7 +61,17 @@ if [ -z "${ZLIB_DIR}" -o "${ZLIB_DIR}" = 'BUILD' ]; then NAME=zlib-1.2.5 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} - INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + if [ -z "${ZLIB_INSTALL_DIR}" ]; then + echo "BEGIN MESSAGE" + echo "ZLIB install directory, ZLIB_INSTALL_DIR, not set. Installing in the default configuration location. " + echo "END MESSAGE" + INSTALL_DIR=${SCRATCH_BUILD}/external/${THORN} + else + echo "BEGIN MESSAGE" + echo "ZLIB install directory, ZLIB_INSTALL_DIR, selected. Installing ZLIB at ${ZLIB_INSTALL_DIR} " + echo "END MESSAGE" + INSTALL_DIR=${ZLIB_INSTALL_DIR} + fi DONE_FILE=${SCRATCH_BUILD}/done/${THORN} ZLIB_DIR=${INSTALL_DIR} |