Fix a bug: after installation of omni binaries it is necessary to correct path to...

diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh
index 576e9894d1476f7cee7d6c33e1d51aa7aaab00a3..05a30a28c563b4e07655bd0b29e11bfb3c1e79ef 100755 (executable)
--- a/config_files/GUI_BIN.sh
+++ b/config_files/GUI_BIN.sh
@@ -22,8 +22,6 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
     export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH}
     export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
     export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
-    export SUITRoot=\${GUI_ROOT_DIR}/share/salome
-    export SalomeAppConfig=\${GUI_ROOT_DIR}/share/salome/resources
   fi
 fi
 ##
@@ -44,8 +42,6 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
     export PATH=\${GUI_ROOT_DIR}/bin/salome:\${PATH}
     export LD_LIBRARY_PATH=\${GUI_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
     export PYTHONPATH=\${GUI_ROOT_DIR}/bin/salome:\${GUI_ROOT_DIR}/lib/salome:\${GUI_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
-    export SUITRoot=\${GUI_ROOT_DIR}/share/salome
-    export SalomeAppConfig=\${GUI_ROOT_DIR}/share/salome/resources
   fi
 fi
 ##

diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh
index e5f02233bb5e1a6e50f78842b2bebfdb80f4d8e4..7fcb7bf31bfa9dab52e109c5764af2b1b4cb8510 100755 (executable)
--- a/config_files/omniORB-4.0.5.sh
+++ b/config_files/omniORB-4.0.5.sh
@@ -144,6 +144,12 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/omniORB-4.0.5.tar.gz -C ${INSTALL_ROOT}
 
 ln -s ${PRODUCT_DIR} ${INSTALL_ROOT}/omni
+
+cd ${PRODUCT_DIR}/bin
+sed -e "s%#\!.*python%#\!`which python`%" omniidl > _omniidl
+mv -f _omniidl omniidl
+chmod a+x omniidl
+
 print_env
 }