*** empty log message ***

[tools/install.git] / config_files / VTK-5.0.0.sh

diff --git a/config_files/VTK-5.0.0.sh b/config_files/VTK-5.0.0.sh
index e83e59df3d6a8f08c0f570fa57bf6252e9e6f51f..0e13dcf8b19ab47d10eea68e05b37c0f07d2b717 100755 (executable)
--- a/config_files/VTK-5.0.0.sh
+++ b/config_files/VTK-5.0.0.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -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
@@ -200,9 +200,9 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD
 #      cd ${PRODUCT_DIR}/include
 #      ln -sf vtk-5.0 vtk
 
-      if test `uname -m` = "x86_64" ; then
-         cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} .
-      fi
+#      if test `uname -m` = "x86_64" ; then
+#        cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} .
+#      fi
 
 #      cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages
 #      ln -sf vtk vtk_python 
@@ -210,11 +210,10 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD
 #      cd ${PRODUCT_DIR}/lib
 #      ln -sf ../lib vtk
 
-      if test `uname -m` = "x86_64" ; then
-         cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* .
-      fi
+#      if test `uname -m` = "x86_64" ; then
+#        cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* .
+#      fi
 
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR};
 
 # remove sources and temporary files after building