From: spo <sergey.pokhodenko@opencascade.com>
Date: Wed, 14 Oct 2015 07:52:10 +0000 (+0300)
Subject: Improve scripts for Linux
X-Git-Tag: V_2.0.0_alfa1~97
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ef8c16fc3ce3711d492087fa1e43808e3b54d587;p=modules%2Fshaper.git

Improve scripts for Linux
---

diff --git a/env.sh b/env.sh
index 68b0c0931..ab13dd393 100644
--- a/env.sh
+++ b/env.sh
@@ -3,7 +3,7 @@
 # Path to sources
 export SOURCES_DIR=$(pwd)
 # Path to build directory
-export BUILD_DIR=$(cd ../build && pwd)
+export BUILD_DIR=$(cd .. && pwd)/build
 # Path to linux_run.sh & salome_run.sh
 export AUT_DIR=$(pwd)
 
@@ -20,4 +20,4 @@ source env_config.sh
 # Path to solvespace-2
 export NEWGEOM_PDIR=/dn48/newgeom/common/products
 # Path to install directory
-export NEWGEOM_ROOT_DIR=$(cd ../install && pwd)
+export NEWGEOM_ROOT_DIR=$(cd .. && pwd)/install
diff --git a/make.sh b/make.sh
index 5c8227185..725d131dc 100755
--- a/make.sh
+++ b/make.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source env.sh
-source env_standalone.sh
+source ${TOOLS_DIR}/env_standalone.sh
 
 CMAKE_ARGS=""
 if [ -f GCOV ]; then 
@@ -14,7 +14,7 @@ elif [ -f DEBUG ]; then
 else
   CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release"
 fi
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}"
+CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${NEWGEOM_ROOT_DIR}"
 CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
 
 mkdir -p ${BUILD_DIR}