diff options
-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} |