From: vsr <vsr@opencascade.com>
Date: Mon, 17 Jan 2011 12:11:36 +0000 (+0000)
Subject: Do not override existing PYTHONPATH
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f03300dae35e4866b2ba69f2ad59d0b14272ea96;p=tools%2Finstall.git

Do not override existing PYTHONPATH
---

diff --git a/config_files/Python-2.4.4.sh b/config_files/Python-2.4.4.sh
index 55294ea..7d7f1ce 100755
--- a/config_files/Python-2.4.4.sh
+++ b/config_files/Python-2.4.4.sh
@@ -41,9 +41,9 @@ export PYTHONROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PYTHONHOME=\$PYTHONROOT
 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_VERSION=$PY_LIBVERSION
 export PYTHON_INCLUDE=\${PYTHONROOT}/include/python\${PYTHON_VERSION}
-export PYTHONPATH=\${PYTHONROOT}/lib/python\${PYTHON_VERSION}
+export PYTHONPATH=\${PYTHONROOT}/lib/python\${PYTHON_VERSION}:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})