From c031f678ae9c3fca58ee0e06416d58132ef5f673 Mon Sep 17 00:00:00 2001 From: dbv Date: Fri, 22 Feb 2013 11:19:34 +0400 Subject: [PATCH] 0023786: Fixed env.sh template Correct patch to correspond env.bat logic --- src/WOKTclLib/templates/env.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh index 852ac91..4d9e215 100755 --- a/src/WOKTclLib/templates/env.sh +++ b/src/WOKTclLib/templates/env.sh @@ -5,6 +5,13 @@ aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath export CASROOT="__CASROOT__" +if [ "${CASROOT}" != "" ] && [ -d "${aScriptPath}/${CASROOT}" ]; then + export CASROOT="${aScriptPath}/${CASROOT}" +fi +if [ "${CASROOT}" == "" ]; then + export CASROOT="${aScriptPath}" +fi + # Reset values export CASDEB="" export HAVE_TBB="false"; -- 2.39.5