Deleting PYTHONHOME variable from Salome environment

diff --git a/config_files/Python-2.4.4.sh b/config_files/Python-2.4.4.sh
index a1547e5995300bff5d43b1d30cd647021083c6a7..ac429ae83916347ea580953d2fb34a0818a3b74c 100755 (executable)
--- a/config_files/Python-2.4.4.sh
+++ b/config_files/Python-2.4.4.sh
@@ -34,16 +34,12 @@ print_env_bin()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-if [ -n "\${PYTHONPATH}" ] ; then
- export PYNATIVE=\${PYTHONPATH}
- export PYTHONPATH=""
-fi
-export PYTHONHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${PYTHONHOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
+export PYTHONROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${PYTHONROOT}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PYTHONROOT}/lib:\${LD_LIBRARY_PATH}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
-export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
-export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYNATIVE}
+export PYTHON_INCLUDE=\${PYTHONROOT}/include/python\${PYTHON_VERSION}
+export PYTHONPATH=\${PYTHONROOT}/lib/python\${PYTHON_VERSION}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/VTK-5.0.0.sh b/config_files/VTK-5.0.0.sh
index 437599151bcfd55edab3854fddbb6dd55792c481..0e13dcf8b19ab47d10eea68e05b37c0f07d2b717 100755 (executable)
--- a/config_files/VTK-5.0.0.sh
+++ b/config_files/VTK-5.0.0.sh
@@ -145,9 +145,9 @@ if [ "${python_version}" != "" ]; then
 #else
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
 #fi
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python${python_version}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python${python_version}"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONROOT}/bin/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONROOT}/include/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONROOT}/lib/python${python_version}/config/libpython${python_version}.a"
 fi
 ### Wrap Tcl settings
 if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then

diff --git a/config_files/graphviz-2.16.1.sh b/config_files/graphviz-2.16.1.sh
index 2adbbd5b7d2220935794a05af64f4e8dd437d521..a063e5d3f92067380bff916bdff1020af78b32ad 100755 (executable)
--- a/config_files/graphviz-2.16.1.sh
+++ b/config_files/graphviz-2.16.1.sh
@@ -118,7 +118,7 @@ cd $ldir
 for l in X `find $ldir -name "*.la"`; do
     if [ "$l" != "X" ] ; then
        pydir="" ; tcldir=""
-       if [ -n "${PYTHONHOME}" ] ; then pydir=${PYTHONHOME} ; fi
+       if [ -n "${PYTHONROOT}" ] ; then pydir=${PYTHONROOT} ; fi
        if [ -n "${TCLHOME}" ] ; then tcldir=${TCLHOME} ; fi
        sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" \
            -e "s%[[:space:]]\(-L\)\?[^[:space:]]*Python[^[:space:]]*/lib% \1${pydir}/lib%g" \

diff --git a/config_files/sip-4.7.3.sh b/config_files/sip-4.7.3.sh
index e4c0326d06f7d1080751fe0a5e3d770a1e2d0ff0..7a4f78b9256038c90a0666781f672a4480c461e7 100755 (executable)
--- a/config_files/sip-4.7.3.sh
+++ b/config_files/sip-4.7.3.sh
@@ -117,13 +117,13 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 # modify sipconfig.py file
-if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then
+if [ -n "${PYTHONROOT}" ] && [ -n "${QTDIR}" ] ; then
 
     cd ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages
     python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
     qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'`
-    sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/bin',%g" sipconfig.py > sipconfig.py.1
-    sed -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py
+    sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/bin',%g" sipconfig.py > sipconfig.py.1
+    sed -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py
     sed -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" sipconfig.py > sipconfig.py.1
     sed -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g"                                                    sipconfig.py.1 > sipconfig.py
     sed -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g"                        sipconfig.py > sipconfig.py.1
@@ -135,8 +135,8 @@ if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then
     sed -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g"     sipconfig.py > sipconfig.py.1
     sed -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g"         sipconfig.py.1 > sipconfig.py
     sed -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g"           sipconfig.py > sipconfig.py.1
-    sed -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/include/python${PYTHON_VERSION}',%g"    sipconfig.py.1 > sipconfig.py
-    sed -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/lib/python${PYTHON_VERSION}/config',%g" sipconfig.py > sipconfig.py.1
+    sed -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g"    sipconfig.py.1 > sipconfig.py
+    sed -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/config',%g" sipconfig.py > sipconfig.py.1
     sed -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g"     sipconfig.py.1 > sipconfig.py
     rm sipconfig.py.1
 fi