aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknarf <knarf@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>2011-04-13 14:23:06 +0000
committerknarf <knarf@091d3ff0-52bc-4db5-b7a6-18201e4c0cca>2011-04-13 14:23:06 +0000
commitd082f6a99761a067111e26f16f04d355e21b43c4 (patch)
tree3e2cc51f201e63e7dcc8bd46dce3a865ce3207fd
parent8d60c2fe98178c883ae3dd7b1b9a69fc71d14810 (diff)
don't set OPENSSL_LIB_DIRS to /usr/lib
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenSSL/trunk@17 091d3ff0-52bc-4db5-b7a6-18201e4c0cca
-rw-r--r--OpenSSL.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSSL.sh b/OpenSSL.sh
index cf93822..f8c1cdb 100644
--- a/OpenSSL.sh
+++ b/OpenSSL.sh
@@ -135,8 +135,10 @@ fi
################################################################################
# Set options
-OPENSSL_INC_DIRS="${OPENSSL_DIR}/include"
-OPENSSL_LIB_DIRS="${OPENSSL_DIR}/lib"
+if [ "${OPENSSL_DIR}" != '/usr' -a "${OPENSSL_DIR}" != '/usr/local' ]; then
+ OPENSSL_INC_DIRS="${OPENSSL_DIR}/include"
+ OPENSSL_LIB_DIRS="${OPENSSL_DIR}/lib"
+fi
OPENSSL_LIBS='ssl crypto'
# Pass options to Cactus