Improve scripts for Linux

diff --git a/env.sh b/env.sh
index 68b0c0931f92ac61358bb6ae2ba06fa14b6adfdf..ab13dd393f00b5fb2ab37f0d2cae70c79df7ea19 100644 (file)
--- 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 5c82271858e4e82679e6b76a2ec128bb9c1a6e7c..725d131dc330fca47fbaaed952a527ed960a65e3 100755 (executable)
--- 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}