From: vsr <vsr@opencascade.com>
Date: Thu, 28 Feb 2013 15:44:22 +0000 (+0000)
Subject: Merge from V6_main 28/02/2013
X-Git-Tag: V7_1_0b1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=212eaf4e50b4af89191086dce6a1458ed8511599;p=modules%2Fjobmanager.git

Merge from V6_main 28/02/2013
---

diff --git a/build_cmake b/build_cmake
index a81bdd4..2868335 100755
--- a/build_cmake
+++ b/build_cmake
@@ -21,7 +21,7 @@
 CURRENT_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
 cd ${CONF_DIR}
-python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --jobmanager
+python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --jobmanager
 status=$?
 cd ${CURRENT_DIR}
 exit $status
diff --git a/build_cmake.bat b/build_cmake.bat
index b669ddb..4ce136f 100644
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -17,4 +17,4 @@
 @REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 @REM
 
-%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --jobmanager
+%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --jobmanager