CMake: Update path variables for current build system

diff --git a/bin/runAppli.in b/bin/runAppli.in
index 7bd9ac9580cf4dff2bff0070d3e5c834affa461b..8c8d96708f95ba18f70788f4826797f453f0c7ff 100755 (executable)
--- a/bin/runAppli.in
+++ b/bin/runAppli.in
@@ -19,8 +19,8 @@
 #
 
 export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
-export PYHELLO_ROOT_DIR=@prefix@
+export HOMARD_ROOT_DIR=@CMAKE_INSTALL_PREFIX@
 
-python -i $PYHELLO_ROOT_DIR/bin/salome/runSalome.py --modules=PYHELLO --xterm --containers=cpp,python --killall
+${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i ${HOMARD_ROOT_DIR}/bin/salome/runSalome.py --modules=HOMARD --xterm --containers=cpp,python --killall
 
 

diff --git a/doc/en/conf.py.in b/doc/en/conf.py.in
index 0f9920b5481900c0a6f66676697e27cb8a32b442..716e760ce449c67ea9bbb53ec4c3837d5997ea96 100644 (file)
--- a/doc/en/conf.py.in
+++ b/doc/en/conf.py.in
@@ -45,7 +45,7 @@ copyright = u'1996, 2011, 2013, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
 # built documents.
 #
 # The short X.Y version.
-version = '@SHORT_VERSION@'
+version = '@SALOMEHOMARD_VERSION@'
 # The full version, including alpha/beta/rc tags.
 release = '@SALOMEHOMARD_VERSION@'