0031379: Configuration - using defined variable of THIRDPARTY_DIR

diff --git a/adm/templates/env.bat.in b/adm/templates/env.bat.in
index 4843d0fde36f8b5d726a9ac9395111c635d49c07..6f57bbf5ef508a253ff8f14e6b0dc4b644516c1b 100644 (file)
--- a/adm/templates/env.bat.in
+++ b/adm/templates/env.bat.in
@@ -119,7 +119,7 @@ rem ----- For compatability with external application using CASROOT -----
 if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
 
 rem ----- Define path to 3rdparty products -----
-set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
+if ["%THIRDPARTY_DIR%"] == [""] set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
 
 if ["%ARCH%"] == ["32"] set VCARCH=x86
 if ["%ARCH%"] == ["64"] set VCARCH=amd64

diff --git a/adm/templates/env.install.sh.in b/adm/templates/env.install.sh.in
index 94d6da85c9f8c7349bbfee4c7993eed063947d49..07f203b4ebda60eae8d3d367c12fada1dad40add 100644 (file)
--- a/adm/templates/env.install.sh.in
+++ b/adm/templates/env.install.sh.in
@@ -8,7 +8,9 @@ if [ "${CASROOT}" == "" ]; then
 fi
 
 # ----- Define path to 3rdparty products -----
-export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+if [ "${THIRDPARTY_DIR}" == "" ]; then
+  export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+fi
 
 # ----- Read script arguments -----
 shopt -s nocasematch