From: mpv <mpv@opencascade.com>
Date: Thu, 5 May 2016 12:30:32 +0000 (+0300)
Subject: Simplification of environment due to SALOME standards
X-Git-Tag: V_2.3.0~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd9061e324388f26ea22a3a6071066daefd52300;p=modules%2Fshaper.git

Simplification of environment due to SALOME standards
---

diff --git a/env_Salome.bat b/env_Salome.bat
index 980ed7b03..e61088b13 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -100,7 +100,7 @@ IF "%ARCH%" == "Win64" (
 )
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
-@SET PATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PATH%
-@SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%SHAPER_ROOT_DIR%\lib\salome;%PYTHONPATH%
+@SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%
+@SET PYTHONPATH=%SHAPER_ROOT_DIR%\lib\salome;%PYTHONPATH%
 
 @SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
diff --git a/env_linux.sh b/env_linux.sh
index c376a2059..adff9d99a 100644
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -52,6 +52,6 @@ export PATH=${CASROOT}:${PATH}
 ##
 
 #------ SHAPER ------
-export PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PATH}
-export PYTHONPATH=${SHAPER_ROOT_DIR}//bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${PYTHONPATH}
+export PATH=${SHAPER_ROOT_DIR}/lib/salome:${PATH}
+export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${PYTHONPATH}
 export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}