diff options
author | eschnett <eschnett@ba58616d-3abc-4c77-8745-3ba8ad4a582f> | 2012-05-01 15:54:59 +0000 |
---|---|---|
committer | eschnett <eschnett@ba58616d-3abc-4c77-8745-3ba8ad4a582f> | 2012-05-01 15:54:59 +0000 |
commit | 6ac04c78a26e5c1892eb11f104844e89cddb2285 (patch) | |
tree | 29654ad37105ca52724b64e8de52a9b14890a7a9 | |
parent | b651fede3b4160027d4fbc3484d3055ecc557d4e (diff) |
Don't add /usr or /usr/local to search paths
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/libjpeg/trunk@17 ba58616d-3abc-4c77-8745-3ba8ad4a582f
-rwxr-xr-x | libjpeg.sh | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -12,7 +12,7 @@ set -e # Abort on errors if [ -z "${LIBJPEG_DIR}" ]; then echo "BEGIN MESSAGE" - echo "LIBJPEG selected, but LIBJPEG_DIR not set. Checking some places..." + echo "LIBJPEG selected, but LIBJPEG_DIR not set. Checking some places..." echo "END MESSAGE" FILES="include/jpeglib.h" @@ -140,8 +140,13 @@ fi ################################################################################ # Set options -LIBJPEG_INC_DIRS="${LIBJPEG_DIR}/include" -LIBJPEG_LIB_DIRS="${LIBJPEG_DIR}/lib" +if [ "${LIBJPEG_DIR}" = '/usr' -o "${LIBJPEG_DIR}" = '/usr/local' ]; then + LIBJPEG_INC_DIRS='' + LIBJPEG_LIB_DIRS='' +else + LIBJPEG_INC_DIRS="${LIBJPEG_DIR}/include" + LIBJPEG_LIB_DIRS="${LIBJPEG_DIR}/lib" +fi LIBJPEG_LIBS='jpeg' # Pass options to Cactus |