diff options
author | schnetter <schnetter@9e23cc15-e5c8-4d65-9080-beda90ea645b> | 2010-03-23 23:11:48 +0000 |
---|---|---|
committer | schnetter <schnetter@9e23cc15-e5c8-4d65-9080-beda90ea645b> | 2010-03-23 23:11:48 +0000 |
commit | 565395318bebfc43f54e1f7113d411130a4a9cc3 (patch) | |
tree | 24b45f6775566b7881dc73bf85d024c98b5eba0b | |
parent | f0048173b56ba91285135906fb2b4223fecca12f (diff) |
Don't overwrite user specified library name
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/GSL/trunk@9 9e23cc15-e5c8-4d65-9080-beda90ea645b
-rw-r--r-- | GSL.sh | 2 | ||||
-rw-r--r-- | configuration.ccl | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -121,7 +121,7 @@ if [ "${GSL_DIR}" != '/usr' -a "${GSL_DIR}" != '/usr/local' ]; then GSL_INC_DIRS="${GSL_DIR}/include" GSL_LIB_DIRS="${GSL_DIR}/lib" fi -GSL_LIBS='gsl gslcblas' +: ${GSL_LIBS='gsl gslcblas'} # Pass options to Cactus echo "BEGIN MAKE_DEFINITION" diff --git a/configuration.ccl b/configuration.ccl index 1e80c0f..25be2cc 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -4,5 +4,5 @@ PROVIDES GSL { SCRIPT GSL.sh LANG bash - OPTIONS GSL_DIR + OPTIONS GSL_DIR GSL_LIBS } |