C3PO: requires mpi4py

[tools/sat_salome.git] / products / env_scripts / sip.py

diff --git a/products/env_scripts/sip.py b/products/env_scripts/sip.py
index eae92bf0321842b71ca253c51dbebff9f2ea1b85..9b79f12edc0c123e3a1294f6ad5a3708df67ba31 100644 (file)
--- a/products/env_scripts/sip.py
+++ b/products/env_scripts/sip.py
@@ -21,12 +21,13 @@ def set_env(env, prereq_dir, version):
         env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
         env.prepend('CPLUS_INCLUDE_PATH', os.path.join(prereq_dir, 'include', pyver))
     else:
-#        env.set('SIPDIR', os.path.join(env.get('PYTHON_ROOT_DIR'),'site-packages'))
-#        env.set('SIP_ROOT_DIR', os.path.join(env.get('PYTHON_ROOT_DIR'),'site-packages'))
-#        env.prepend('CPLUS_INCLUDE_PATH', os.path.join( env.get('PYTHON_INCLUDE_PATH'), pyver))
         env.prepend('CPLUS_INCLUDE_PATH', os.path.join(prereq_dir, 'include', pyver))
-        env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
-        env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
+        if '5.5.0' in version:
+            env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'Lib', 'site-packages'))
+            env.prepend('PATH', os.path.join(prereq_dir, 'scripts'))
+        else:
+            env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
+            env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
   
 def set_nativ_env(env):
     env.set('SIPDIR', '/usr')