From: nds <nds@opencascade.com>
Date: Tue, 18 Feb 2020 05:07:07 +0000 (+0300)
Subject: 0031379: Configuration - using defined variable of THIRDPARTY_DIR
X-Git-Tag: V7_5_0_beta~41
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=b3bf8485a2dcf04c4f215df48a96d3fd175fcfcf;p=occt.git

0031379: Configuration - using defined variable of THIRDPARTY_DIR
---

diff --git a/adm/templates/env.bat.in b/adm/templates/env.bat.in
index 4843d0fde3..6f57bbf5ef 100644
--- 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 94d6da85c9..07f203b4eb 100644
--- 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