]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Small correction
authormaintenance team <salome-mnt@opencascade.com>
Thu, 19 Oct 2006 14:28:14 +0000 (14:28 +0000)
committermaintenance team <salome-mnt@opencascade.com>
Thu, 19 Oct 2006 14:28:14 +0000 (14:28 +0000)
config_files/VTK-4.2.6.sh
config_files/vtk-4.2.6.patch [new file with mode: 0644]

index 1e056c6c997a572e8f3df7cc7cb454ecbdbfbfc1..c35db83c244011e3178c16207caae58a49018c24 100755 (executable)
@@ -82,7 +82,15 @@ EOF
 check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 
 check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
+
+if test `uname -m` = "x86_64" ; then
+cp ${SOURCE_DIR}/../../config_files/vtk-4.2.6.patch  ${PRODUCT_WORK}
+cd ${PRODUCT_WORK} 
+patch -p 1 -i vtk-4.2.6.patch
+else
 cd ${PRODUCT_WORK}
+fi
+
 # apply a small patch for VTK (needed for gcc-3.4)
 sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
 mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx
@@ -164,24 +172,32 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make
 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
-  if test `uname -m` = "x86_64" ; then
-cd ${PRODUCT_WORK}/Wrapping/Python
-sed -e "s%/lib/vtk%/lib64/vtk%" setup.py.in > _setup.py.in
-mv -f _setup.py.in setup.py.in
-chmod a+x setup.py.in
-else
+#  if test `uname -m` = "x86_64" ; then
+#cd ${PRODUCT_WORK}/Wrapping/Python
+#sed -e "s%/lib/vtk%/lib64/vtk%" setup.py.in > _setup.py.in
+#mv -f _setup.py.in setup.py.in
+#chmod a+x setup.py.in
+#else
 cd ${PRODUCT_WORK}/Wrapping/Python
-  fi
+#  fi
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
+# set correct symbolic links - bug of python wrappings installation
+  if test `uname -m` = "x86_64" ; then
+      cd ${PRODUCT_DIR}/lib64/python${python_version}/site-packages/vtk_python
+  else
+      cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
+  fi
+  ln -sf ../../../vtk/*Python*.so .
+
+  if test `uname -m` = "x86_64" ; then
+      cd ${PRODUCT_DIR}; ln -sf lib64 lib
+  fi
+
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 #du -sk ${INSTALL_WORK}/cmake-1.6.6 >> ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 
-# set correct symbolic links - bug of python wrappings installation
-cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
-ln -sf ../../../vtk/*Python*.so .
-
 print_env
 }
 
diff --git a/config_files/vtk-4.2.6.patch b/config_files/vtk-4.2.6.patch
new file mode 100644 (file)
index 0000000..f5a3710
--- /dev/null
@@ -0,0 +1,820 @@
+diff -Naur VTK-4.2.6-original/CMake/FindOSMesa.cmake VTK-4.2.6-changed/CMake/FindOSMesa.cmake
+--- VTK-4.2.6-original/CMake/FindOSMesa.cmake  2003-02-12 02:05:20.000000000 +0300
++++ VTK-4.2.6-changed/CMake/FindOSMesa.cmake   2006-10-03 11:33:54.000000000 +0400
+@@ -19,11 +19,11 @@
+ # in the main Mesa library
+ IF (NOT OSMESA_LIBRARY)
+   FIND_LIBRARY(OSMESA_LIBRARY OSMesa
+-    /usr/lib 
+-    /usr/local/lib 
+-    /opt/graphics/OpenGL/lib 
+-    /usr/openwin/lib 
+-    /usr/X11R6/lib
++    /usr/lib64 
++    /usr/local/lib64 
++    /opt/graphics/OpenGL/lib64 
++    /usr/openwin/lib64 
++    /usr/X11R6/lib64
+   )
+ ENDIF (NOT OSMESA_LIBRARY)
+diff -Naur VTK-4.2.6-original/CMakeLists.txt VTK-4.2.6-changed/CMakeLists.txt
+--- VTK-4.2.6-original/CMakeLists.txt  2004-03-03 22:28:17.000000000 +0300
++++ VTK-4.2.6-changed/CMakeLists.txt   2006-10-04 14:02:56.000000000 +0400
+@@ -448,8 +448,8 @@
+ # Configure Matrox Imaging support.
+ IF(VTK_USE_MATROX_IMAGING)
+   FIND_LIBRARY(MIL_LIBRARY MIL
+-    "C:/Program Files/Matrox Imaging/mil/library/winnt/msc/dll"
+-    "C:/Program Files/Matrox Imaging/mil/library/windows/msc/dll"
++    "C:/Program Files/Matrox Imaging/mil/lib64rary/winnt/msc/dll"
++    "C:/Program Files/Matrox Imaging/mil/lib64rary/windows/msc/dll"
+     )
+   FIND_PATH(MIL_INCLUDE_PATH mil.h
+     "C:/Program Files/Matrox Imaging/mil/include"
+@@ -698,11 +698,11 @@
+ ENDIF(VTK_USE_PARALLEL)
+ # Install cmake extensions so user projects can load them.
+-INSTALL_FILES(/lib/vtk/CMake FILES
++INSTALL_FILES(/lib64/vtk/CMake FILES
+               ${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake)
+ FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2
+             VTK_MAKE_INSTANTIATOR2 VTK_GENERATE_JAVA_DEPENDENCIES)
+-  INSTALL_FILES(/lib/vtk/CMake FILES
++  INSTALL_FILES(/lib64/vtk/CMake FILES
+     "${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}"
+   )
+ ENDFOREACH(cmd)
+@@ -710,7 +710,7 @@
+ # Save the compiler settings so another project can import them.
+ INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
+ CMAKE_EXPORT_BUILD_SETTINGS(${VTK_BINARY_DIR}/VTKBuildSettings.cmake)
+-INSTALL_FILES(/lib/vtk .cmake VTKBuildSettings)
++INSTALL_FILES(/lib64/vtk .cmake VTKBuildSettings)
+ # Save library dependencies.
+ EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake)
+@@ -720,9 +720,9 @@
+ # Install some files.
+ INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits)
+-INSTALL_FILES(/lib/vtk .cmake UseVTK VTKLibraryDepends)
++INSTALL_FILES(/lib64/vtk .cmake UseVTK VTKLibraryDepends)
+ IF(VTK_WRAP_HINTS)
+-  INSTALL_FILES(/lib/vtk FILES ${VTK_WRAP_HINTS})
++  INSTALL_FILES(/lib64/vtk FILES ${VTK_WRAP_HINTS})
+ ENDIF(VTK_WRAP_HINTS)
+ #-----------------------------------------------------------------------------
+diff -Naur VTK-4.2.6-original/Common/CMakeLists.txt VTK-4.2.6-changed/Common/CMakeLists.txt
+--- VTK-4.2.6-original/Common/CMakeLists.txt   2003-02-13 00:48:52.000000000 +0300
++++ VTK-4.2.6-changed/Common/CMakeLists.txt    2006-10-04 14:03:25.000000000 +0400
+@@ -250,7 +250,7 @@
+   VTK_WRAP_TCL2(vtkCommonTCL CommonTCL_SRCS ${Common_SRCS})
+   ADD_LIBRARY(vtkCommonTCL ${CommonTCL_SRCS} vtkTclUtil.cxx)
+   TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY} vtkCommon)
+-  INSTALL_TARGETS(/lib/vtk vtkCommonTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkCommonTCL)
+   INSTALL_FILES(/include/vtk .h
+     vtkTclUtil
+   )
+@@ -271,7 +271,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkCommonPython vtkCommon)
+-  INSTALL_TARGETS(/lib/vtk vtkCommonPython)
++  INSTALL_TARGETS(/lib64/vtk vtkCommonPython)
+   INSTALL_FILES(/include/vtk .h
+     vtkPythonUtil
+   )
+@@ -284,13 +284,13 @@
+   VTK_WRAP_JAVA2(vtkCommonJava CommonJava_SRCS ${Common_SRCS})
+   ADD_LIBRARY(vtkCommonJava SHARED ${CommonJava_SRCS} vtkJavaUtil.cxx)
+   TARGET_LINK_LIBRARIES(vtkCommonJava vtkCommon)
+-  INSTALL_TARGETS(/lib/vtk vtkCommonJava)
++  INSTALL_TARGETS(/lib64/vtk vtkCommonJava)
+   INSTALL_FILES(/include/vtk .h
+     vtkJavaUtil
+   )
+ ENDIF (VTK_WRAP_JAVA)
+-INSTALL_TARGETS(/lib/vtk vtkCommon)
++INSTALL_TARGETS(/lib64/vtk vtkCommon)
+ INSTALL_FILES(/include/vtk .h ${Common_SRCS}
+   vtkCellType
+   vtkSetGet
+@@ -306,7 +306,7 @@
+   vtkImageProgressIterator
+ )
+-INSTALL_FILES(/lib/vtk/testing FILES
++INSTALL_FILES(/lib64/vtk/testing FILES
+               ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
+               ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
+               ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
+@@ -314,6 +314,6 @@
+ INSTALL_FILES(/include/vtk FILES
+               ${VTK_SOURCE_DIR}/Common/Testing/Cxx/vtkRegressionTestImage.h)
+ IF(VTK_USE_PARALLEL)
+-  INSTALL_FILES(/lib/vtk/testing FILES
++  INSTALL_FILES(/lib64/vtk/testing FILES
+                 ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl)
+ ENDIF(VTK_USE_PARALLEL)
+diff -Naur VTK-4.2.6-original/Common/Testing/Install/test.sh.in VTK-4.2.6-changed/Common/Testing/Install/test.sh.in
+--- VTK-4.2.6-original/Common/Testing/Install/test.sh.in       2006-10-04 11:09:49.000000000 +0400
++++ VTK-4.2.6-changed/Common/Testing/Install/test.sh.in        2006-10-04 11:09:24.000000000 +0400
+@@ -47,7 +47,7 @@
+     echo "Writing CMakeCache.txt"
+     (
+         cat > CMakeCache.txt <<EOF
+-VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib/vtk
++VTK_DIR:FILEPATH=${CMAKE_INSTALL_PREFIX}/lib64/vtk
+ EOF
+     )
+ }
+diff -Naur VTK-4.2.6-original/Filtering/CMakeLists.txt VTK-4.2.6-changed/Filtering/CMakeLists.txt
+--- VTK-4.2.6-original/Filtering/CMakeLists.txt        2003-02-13 00:48:52.000000000 +0300
++++ VTK-4.2.6-changed/Filtering/CMakeLists.txt 2006-10-04 14:03:53.000000000 +0400
+@@ -124,7 +124,7 @@
+   VTK_WRAP_TCL2(vtkFilteringTCL FilteringTCL_SRCS ${Filtering_SRCS})
+   ADD_LIBRARY(vtkFilteringTCL ${FilteringTCL_SRCS})
+   TARGET_LINK_LIBRARIES (vtkFilteringTCL vtkCommonTCL vtkFiltering ${TCL_LIBRARY})
+-  INSTALL_TARGETS(/lib/vtk vtkFilteringTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkFilteringTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -143,7 +143,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkFilteringPython vtkFiltering)
+-  INSTALL_TARGETS(/lib/vtk vtkFilteringPython)
++  INSTALL_TARGETS(/lib64/vtk vtkFilteringPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ # if we are wrapping into Java then add the library and extra
+@@ -153,9 +153,9 @@
+   VTK_WRAP_JAVA2(vtkFilteringJava FilteringJava_SRCS ${Filtering_SRCS})
+   ADD_LIBRARY(vtkFilteringJava SHARED ${FilteringJava_SRCS})
+   TARGET_LINK_LIBRARIES (vtkFilteringJava vtkCommonJava vtkFiltering)
+-  INSTALL_TARGETS(/lib/vtk vtkFilteringJava)
++  INSTALL_TARGETS(/lib64/vtk vtkFilteringJava)
+ ENDIF (VTK_WRAP_JAVA)
+-INSTALL_TARGETS(/lib/vtk vtkFiltering)
++INSTALL_TARGETS(/lib64/vtk vtkFiltering)
+ INSTALL_FILES(/include/vtk .h ${Filtering_SRCS})
+diff -Naur VTK-4.2.6-original/Graphics/CMakeLists.txt VTK-4.2.6-changed/Graphics/CMakeLists.txt
+--- VTK-4.2.6-original/Graphics/CMakeLists.txt 2003-11-07 19:07:10.000000000 +0300
++++ VTK-4.2.6-changed/Graphics/CMakeLists.txt  2006-10-04 14:04:03.000000000 +0400
+@@ -190,7 +190,7 @@
+   ADD_LIBRARY(vtkGraphicsTCL ${GraphicsTCL_SRCS})
+   TARGET_LINK_LIBRARIES (vtkGraphicsTCL vtkFilteringTCL vtkGraphics
+                          ${TCL_LIBRARY})
+-  INSTALL_TARGETS(/lib/vtk vtkGraphicsTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkGraphicsTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -211,7 +211,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkGraphicsPython vtkGraphics)
+-  INSTALL_TARGETS(/lib/vtk vtkGraphicsPython)
++  INSTALL_TARGETS(/lib64/vtk vtkGraphicsPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ # if we are wrapping into Java then add the library and extra
+@@ -222,10 +222,10 @@
+   ADD_LIBRARY(vtkGraphicsJava SHARED ${GraphicsJava_SRCS})
+   TARGET_LINK_LIBRARIES (vtkGraphicsJava vtkCommonJava vtkFilteringJava 
+                          vtkGraphics)
+-  INSTALL_TARGETS(/lib/vtk vtkGraphicsJava)
++  INSTALL_TARGETS(/lib64/vtk vtkGraphicsJava)
+ ENDIF (VTK_WRAP_JAVA)
+-INSTALL_TARGETS(/lib/vtk vtkGraphics)
++INSTALL_TARGETS(/lib64/vtk vtkGraphics)
+ INSTALL_FILES(/include/vtk .h ${Graphics_SRCS})
+diff -Naur VTK-4.2.6-original/Hybrid/CMakeLists.txt VTK-4.2.6-changed/Hybrid/CMakeLists.txt
+--- VTK-4.2.6-original/Hybrid/CMakeLists.txt   2003-11-11 20:50:47.000000000 +0300
++++ VTK-4.2.6-changed/Hybrid/CMakeLists.txt    2006-10-04 14:04:13.000000000 +0400
+@@ -94,7 +94,7 @@
+     ENDIF (VTK_USE_MATROX_IMAGING)
+   ENDIF (WIN32)
+-  INSTALL_TARGETS(/lib/vtk vtkHybridTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkHybridTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -123,7 +123,7 @@
+     ENDIF (VTK_USE_MATROX_IMAGING)
+   ENDIF (WIN32)
+-  INSTALL_TARGETS(/lib/vtk vtkHybridPython)
++  INSTALL_TARGETS(/lib64/vtk vtkHybridPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ IF (VTK_WRAP_JAVA)
+@@ -139,7 +139,7 @@
+     ENDIF (VTK_USE_MATROX_IMAGING)
+   ENDIF (WIN32)
+-  INSTALL_TARGETS(/lib/vtk vtkHybridJava)
++  INSTALL_TARGETS(/lib64/vtk vtkHybridJava)
+ ENDIF (VTK_WRAP_JAVA)
+ TARGET_LINK_LIBRARIES (vtkHybrid vtkRendering vtkIO)
+@@ -153,6 +153,6 @@
+   ENDIF (VTK_USE_MATROX_IMAGING)
+ ENDIF (WIN32)
+-INSTALL_TARGETS(/lib/vtk vtkHybrid)
++INSTALL_TARGETS(/lib64/vtk vtkHybrid)
+ INSTALL_FILES(/include/vtk .h ${Hybrid_SRCS})
+ INSTALL_FILES(/include/vtk .h vtk3DS)
+diff -Naur VTK-4.2.6-original/Imaging/CMakeLists.txt VTK-4.2.6-changed/Imaging/CMakeLists.txt
+--- VTK-4.2.6-original/Imaging/CMakeLists.txt  2003-11-07 19:05:44.000000000 +0300
++++ VTK-4.2.6-changed/Imaging/CMakeLists.txt   2006-10-04 14:04:31.000000000 +0400
+@@ -144,7 +144,7 @@
+                          vtkFilteringTCL
+                          vtkImaging
+                          ${TCL_LIBRARY})
+-  INSTALL_TARGETS(/lib/vtk vtkImagingTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkImagingTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -165,7 +165,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkImagingPython vtkImaging)
+-  INSTALL_TARGETS(/lib/vtk vtkImagingPython)
++  INSTALL_TARGETS(/lib64/vtk vtkImagingPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ # if we are wrapping into Java then add the library and extra
+@@ -178,8 +178,8 @@
+                          vtkCommonJava
+                          vtkFilteringJava
+                        vtkImaging)
+-  INSTALL_TARGETS(/lib/vtk vtkImagingJava)
++  INSTALL_TARGETS(/lib64/vtk vtkImagingJava)
+ ENDIF (VTK_WRAP_JAVA)
+-INSTALL_TARGETS(/lib/vtk vtkImaging)
++INSTALL_TARGETS(/lib64/vtk vtkImaging)
+ INSTALL_FILES(/include/vtk .h ${Imaging_SRCS})
+diff -Naur VTK-4.2.6-original/IO/CMakeLists.txt VTK-4.2.6-changed/IO/CMakeLists.txt
+--- VTK-4.2.6-original/IO/CMakeLists.txt       2003-02-13 00:48:53.000000000 +0300
++++ VTK-4.2.6-changed/IO/CMakeLists.txt        2006-10-04 14:04:22.000000000 +0400
+@@ -162,7 +162,7 @@
+                          vtkFilteringTCL
+                          vtkIO
+                          ${TCL_LIBRARY})
+-  INSTALL_TARGETS(/lib/vtk vtkIOTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkIOTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -183,7 +183,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkIOPython vtkIO)
+-  INSTALL_TARGETS(/lib/vtk vtkIOPython)
++  INSTALL_TARGETS(/lib64/vtk vtkIOPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ # if we are wrapping into Java then add the library and extra
+@@ -196,9 +196,9 @@
+                          vtkCommonJava
+                          vtkFilteringJava
+                        vtkIO)
+-  INSTALL_TARGETS(/lib/vtk vtkIOJava)
++  INSTALL_TARGETS(/lib64/vtk vtkIOJava)
+ ENDIF (VTK_WRAP_JAVA)
+-INSTALL_TARGETS(/lib/vtk vtkIO)
++INSTALL_TARGETS(/lib64/vtk vtkIO)
+ INSTALL_FILES(/include/vtk .h ${IO_SRCS})
+diff -Naur VTK-4.2.6-original/Parallel/CMakeLists.txt VTK-4.2.6-changed/Parallel/CMakeLists.txt
+--- VTK-4.2.6-original/Parallel/CMakeLists.txt 2003-02-17 23:00:36.000000000 +0300
++++ VTK-4.2.6-changed/Parallel/CMakeLists.txt  2006-10-04 14:04:41.000000000 +0400
+@@ -108,7 +108,7 @@
+   VTK_WRAP_TCL2(vtkParallelTCL ParallelTCL_SRCS ${Parallel_SRCS})
+   ADD_LIBRARY(vtkParallelTCL ${ParallelTCL_SRCS})
+   TARGET_LINK_LIBRARIES (vtkParallelTCL vtkParallel vtkIOTCL vtkRenderingTCL)
+-  INSTALL_TARGETS(/lib/vtk vtkParallelTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkParallelTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -129,19 +129,19 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkParallelPython vtkParallel)
+-  INSTALL_TARGETS(/lib/vtk vtkParallelPython)
++  INSTALL_TARGETS(/lib64/vtk vtkParallelPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ IF (VTK_WRAP_JAVA)
+   VTK_WRAP_JAVA2(vtkParallelJava ParallelJava_SRCS ${Parallel_SRCS})
+   ADD_LIBRARY(vtkParallelJava SHARED ${ParallelJava_SRCS})
+   TARGET_LINK_LIBRARIES (vtkParallelJava vtkParallel vtkRenderingJava vtkIOJava)
+-  INSTALL_TARGETS(/lib/vtk vtkParallelJava)
++  INSTALL_TARGETS(/lib64/vtk vtkParallelJava)
+ ENDIF (VTK_WRAP_JAVA)
+ TARGET_LINK_LIBRARIES (vtkParallel vtkRendering vtkIO)
+-INSTALL_TARGETS(/lib/vtk vtkParallel)
++INSTALL_TARGETS(/lib64/vtk vtkParallel)
+ INSTALL_FILES(/include/vtk .h ${Parallel_SRCS})
+ IF (VTK_USE_MPI)
+   INSTALL_FILES(/include/vtk "vtkMPI\\.h")
+diff -Naur VTK-4.2.6-original/Patented/CMakeLists.txt VTK-4.2.6-changed/Patented/CMakeLists.txt
+--- VTK-4.2.6-original/Patented/CMakeLists.txt 2003-02-13 00:48:53.000000000 +0300
++++ VTK-4.2.6-changed/Patented/CMakeLists.txt  2006-10-04 14:04:52.000000000 +0400
+@@ -39,7 +39,7 @@
+   ADD_LIBRARY(vtkPatentedTCL ${PatentedTCL_SRCS})
+   TARGET_LINK_LIBRARIES (vtkPatentedTCL vtkPatented vtkIOTCL vtkGraphicsTCL
+                          vtkImagingTCL)
+-  INSTALL_TARGETS(/lib/vtk vtkPatentedTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkPatentedTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -60,7 +60,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkPatentedPython vtkPatented)
+-  INSTALL_TARGETS(/lib/vtk vtkPatentedPython)
++  INSTALL_TARGETS(/lib64/vtk vtkPatentedPython)
+ ENDIF (VTK_WRAP_PYTHON)
+ # if we are wrapping into Java then add the library and extra
+@@ -71,7 +71,7 @@
+   ADD_LIBRARY(vtkPatentedJava SHARED ${PatentedJava_SRCS})
+   TARGET_LINK_LIBRARIES (vtkPatentedJava vtkPatented vtkImagingJava
+                          vtkGraphicsJava)
+-  INSTALL_TARGETS(/lib/vtk vtkPatentedJava)
++  INSTALL_TARGETS(/lib64/vtk vtkPatentedJava)
+ ENDIF (VTK_WRAP_JAVA)
+ TARGET_LINK_LIBRARIES ( vtkPatented
+@@ -80,5 +80,5 @@
+ vtkIO
+ )
+-INSTALL_TARGETS(/lib/vtk vtkPatented)
++INSTALL_TARGETS(/lib64/vtk vtkPatented)
+ INSTALL_FILES(/include/vtk .h ${Patented_SRCS})
+diff -Naur VTK-4.2.6-original/Rendering/CMakeLists.txt VTK-4.2.6-changed/Rendering/CMakeLists.txt
+--- VTK-4.2.6-original/Rendering/CMakeLists.txt        2003-02-17 23:32:16.000000000 +0300
++++ VTK-4.2.6-changed/Rendering/CMakeLists.txt 2006-10-04 14:05:10.000000000 +0400
+@@ -344,7 +344,7 @@
+   IF (TK_LIBRARY)
+     TARGET_LINK_LIBRARIES (vtkRenderingTCL ${TK_LIBRARY})
+   ENDIF (TK_LIBRARY)
+-  INSTALL_TARGETS(/lib/vtk vtkRenderingTCL)
++  INSTALL_TARGETS(/lib64/vtk vtkRenderingTCL)
+ ENDIF (VTK_WRAP_TCL)
+ # if we are wrapping into Python then add the library and extra
+@@ -368,7 +368,7 @@
+   ENDIF(WIN32)
+   TARGET_LINK_LIBRARIES(vtkRenderingPython vtkRendering)
+-  INSTALL_TARGETS(/lib/vtk vtkRenderingPython)
++  INSTALL_TARGETS(/lib64/vtk vtkRenderingPython)
+   IF (TK_LIBRARY)
+      IF(NOT VTK_USE_COCOA)
+        SET(RenderingPythonTkWidgets_SRCS
+@@ -382,7 +382,7 @@
+                               vtkRendering
+                               ${TCL_LIBRARY}
+                               ${TK_LIBRARY})
+-       INSTALL_TARGETS(/lib/vtk vtkRenderingPythonTkWidgets)
++       INSTALL_TARGETS(/lib64/vtk vtkRenderingPythonTkWidgets)
+      ENDIF(NOT VTK_USE_COCOA)
+   ENDIF (TK_LIBRARY)
+ ENDIF (VTK_WRAP_PYTHON)
+@@ -403,7 +403,7 @@
+     TARGET_LINK_LIBRARIES (vtkRenderingJava ${JAVA_AWT_LIBRARY})
+   ENDIF (JAVA_AWT_LIBRARY)
+-  INSTALL_TARGETS(/lib/vtk vtkRenderingJava)
++  INSTALL_TARGETS(/lib64/vtk vtkRenderingJava)
+ ENDIF (VTK_WRAP_JAVA)
+@@ -412,7 +412,7 @@
+   ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
+ ENDIF(VTK_USE_X)
+-INSTALL_TARGETS(/lib/vtk vtkRendering)
++INSTALL_TARGETS(/lib64/vtk vtkRendering)
+ INSTALL_FILES(/include/vtk .h ${Rendering_SRCS} ${RenderingOpenGL_SRCS})
+ CONFIGURE_FILE(
+diff -Naur VTK-4.2.6-original/Utilities/CMakeLists.txt VTK-4.2.6-changed/Utilities/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/CMakeLists.txt        2003-02-12 02:04:12.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/CMakeLists.txt 2006-10-04 14:08:06.000000000 +0400
+@@ -12,4 +12,4 @@
+ # This is the installed VTKConfig.cmake file configured at the top
+ # level.
+-INSTALL_FILES(/lib/vtk .cmake VTKConfig)
++INSTALL_FILES(/lib64/vtk .cmake VTKConfig)
+diff -Naur VTK-4.2.6-original/Utilities/Doxygen/CMakeLists.txt VTK-4.2.6-changed/Utilities/Doxygen/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/Doxygen/CMakeLists.txt        2002-11-19 21:41:34.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/Doxygen/CMakeLists.txt 2006-10-04 14:08:13.000000000 +0400
+@@ -24,9 +24,9 @@
+ INCLUDE (${VTK_SOURCE_DIR}/Utilities/Doxygen/LocalUserOptions.cmake OPTIONAL)
+-INSTALL_FILES(/lib/vtk/doxygen "\\.css$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.gif$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.html$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.pl$")
+-INSTALL_FILES(/lib/vtk/doxygen "\\.stop$")
+-INSTALL_FILES(/lib/vtk/doxygen .txt authors doc_readme)
++INSTALL_FILES(/lib64/vtk/doxygen "\\.css$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.gif$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.html$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.pl$")
++INSTALL_FILES(/lib64/vtk/doxygen "\\.stop$")
++INSTALL_FILES(/lib64/vtk/doxygen .txt authors doc_readme)
+diff -Naur VTK-4.2.6-original/Utilities/expat/CMakeLists.txt VTK-4.2.6-changed/Utilities/expat/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/expat/CMakeLists.txt  2003-01-21 01:04:02.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/expat/CMakeLists.txt   2006-10-04 14:08:19.000000000 +0400
+@@ -25,5 +25,5 @@
+ ADD_LIBRARY(vtkexpat ${expat_SRCS})
+-INSTALL_TARGETS(/lib/vtk vtkexpat)
++INSTALL_TARGETS(/lib64/vtk vtkexpat)
+ INSTALL_FILES(/include/vtk .h expat expatDllConfig)
+diff -Naur VTK-4.2.6-original/Utilities/freetype/CMakeLists.txt VTK-4.2.6-changed/Utilities/freetype/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/freetype/CMakeLists.txt       2003-02-06 22:19:37.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/freetype/CMakeLists.txt        2006-10-04 14:08:25.000000000 +0400
+@@ -100,7 +100,7 @@
+ IF (APPLE)
+   TARGET_LINK_LIBRARIES(vtkfreetype "-framework AppKit")
+ ENDIF (APPLE)
+-INSTALL_TARGETS (/lib/vtk vtkfreetype)
++INSTALL_TARGETS (/lib64/vtk vtkfreetype)
+ #
+ # Do not cover this lib
+diff -Naur VTK-4.2.6-original/Utilities/ftgl/CMakeLists.txt VTK-4.2.6-changed/Utilities/ftgl/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/ftgl/CMakeLists.txt   2003-02-13 02:13:49.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/ftgl/CMakeLists.txt    2006-10-04 14:08:30.000000000 +0400
+@@ -146,7 +146,7 @@
+ #
+ ADD_LIBRARY (vtkftgl ${FTGL_SRCS})
+ TARGET_LINK_LIBRARIES(vtkftgl ${VTKFTGL_LIBS})
+-INSTALL_TARGETS (/lib/vtk vtkftgl)
++INSTALL_TARGETS (/lib64/vtk vtkftgl)
+ #
+ # Do not cover this lib
+@@ -197,12 +197,12 @@
+     IF (VTK_USE_X)
+       SET (VTKFTGL_EXAMPLES_LIBS "${VTKFTGL_EXAMPLES_LIBS};-lXt")
+       FIND_LIBRARY (XMU_LIBRARY Xmu
+-        /usr/lib 
+-        /usr/local/lib 
+-        /opt/graphics/OpenGL/lib 
+-        /usr/openwin/lib 
+-        /usr/X11R6/lib
+-        /usr/contrib/X11R6/lib
++        /usr/lib64 
++        /usr/local/lib64 
++        /opt/graphics/OpenGL/lib64 
++        /usr/openwin/lib64 
++        /usr/X11R6/lib64
++        /usr/contrib/X11R6/lib64
+       )
+       MARK_AS_ADVANCED (XMU_LIBRARY)
+       IF (XMU_LIBRARY)
+diff -Naur VTK-4.2.6-original/Utilities/jpeg/CMakeLists.txt VTK-4.2.6-changed/Utilities/jpeg/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/jpeg/CMakeLists.txt   2002-07-17 15:58:54.000000000 +0400
++++ VTK-4.2.6-changed/Utilities/jpeg/CMakeLists.txt    2006-10-04 14:08:36.000000000 +0400
+@@ -48,5 +48,5 @@
+ ADD_LIBRARY(vtkjpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
+-INSTALL_TARGETS(/lib/vtk vtkjpeg)
++INSTALL_TARGETS(/lib64/vtk vtkjpeg)
+diff -Naur VTK-4.2.6-original/Utilities/png/CMakeLists.txt VTK-4.2.6-changed/Utilities/png/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/png/CMakeLists.txt    2003-02-04 17:38:36.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/png/CMakeLists.txt     2006-10-04 14:08:42.000000000 +0400
+@@ -29,5 +29,5 @@
+ ADD_LIBRARY(vtkpng ${PNG_SRCS})
+ TARGET_LINK_LIBRARIES(vtkpng ${VTK_ZLIB_LIBRARIES})
+-INSTALL_TARGETS(/lib/vtk vtkpng)
++INSTALL_TARGETS(/lib64/vtk vtkpng)
+ INSTALL_FILES(/include/vtk .h png pngconf pngDllConfig)
+diff -Naur VTK-4.2.6-original/Utilities/tiff/CMakeLists.txt VTK-4.2.6-changed/Utilities/tiff/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/tiff/CMakeLists.txt   2003-02-04 17:38:36.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/tiff/CMakeLists.txt    2006-10-04 14:08:47.000000000 +0400
+@@ -64,5 +64,5 @@
+ ADD_LIBRARY(vtktiff ${common_SRCS})
+ TARGET_LINK_LIBRARIES( vtktiff ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} )
+-INSTALL_TARGETS(/lib/vtk vtktiff)
++INSTALL_TARGETS(/lib64/vtk vtktiff)
+ INSTALL_FILES(/include/vtk .h tiffDllConfig tiffvers tiff tiffio tconf)
+diff -Naur VTK-4.2.6-original/Utilities/zlib/CMakeLists.txt VTK-4.2.6-changed/Utilities/zlib/CMakeLists.txt
+--- VTK-4.2.6-original/Utilities/zlib/CMakeLists.txt   2002-11-20 18:09:01.000000000 +0300
++++ VTK-4.2.6-changed/Utilities/zlib/CMakeLists.txt    2006-10-04 14:08:53.000000000 +0400
+@@ -33,5 +33,5 @@
+ ADD_LIBRARY(vtkzlib ${ZLIB_SRCS})
+-INSTALL_TARGETS(/lib/vtk vtkzlib)
++INSTALL_TARGETS(/lib64/vtk vtkzlib)
+ INSTALL_FILES(/include/vtk .h zlib zconf zlibDllConfig)
+diff -Naur VTK-4.2.6-original/vtkGenerateVTKConfig.cmake VTK-4.2.6-changed/vtkGenerateVTKConfig.cmake
+--- VTK-4.2.6-original/vtkGenerateVTKConfig.cmake      2003-11-12 19:32:15.000000000 +0300
++++ VTK-4.2.6-changed/vtkGenerateVTKConfig.cmake       2006-10-03 17:41:55.000000000 +0400
+@@ -113,15 +113,15 @@
+ # Settings specific to the install tree.
+ # The "use" file.
+-SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/UseVTK.cmake)
++SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib64/vtk/UseVTK.cmake)
+ # The build settings file.
+-SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKBuildSettings.cmake)
++SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib64/vtk/VTKBuildSettings.cmake)
+ # The wrapping hints file.
+ IF(VTK_WRAP_HINTS)
+   GET_FILENAME_COMPONENT(VTK_HINTS_FNAME ${VTK_WRAP_HINTS} NAME)
+-  SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/${VTK_HINTS_FNAME})
++  SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/${VTK_HINTS_FNAME})
+ ENDIF(VTK_WRAP_HINTS)
+ # Include directories.
+@@ -131,7 +131,7 @@
+ )
+ # Link directories.
+-SET(VTK_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk)
++SET(VTK_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk)
+ # Executable locations.
+ SET(VTK_TCL_HOME_CONFIG "")
+@@ -143,7 +143,7 @@
+ SET(VTK_DOXYGEN_HOME_CONFIG "")
+ IF(VTK_WRAP_TCL)
+   SET(VTK_WRAP_TCL_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapTcl)
+-  SET(VTK_TCL_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/tcl)
++  SET(VTK_TCL_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/tcl)
+ ENDIF(VTK_WRAP_TCL)
+ IF(VTK_WRAP_PYTHON)
+   SET(VTK_WRAP_PYTHON_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapPython)
+@@ -151,18 +151,18 @@
+ IF(VTK_WRAP_JAVA)
+   SET(VTK_PARSE_JAVA_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkParseJava)
+   SET(VTK_WRAP_JAVA_EXE_CONFIG ${CMAKE_INSTALL_PREFIX}/bin/vtkWrapJava)
+-  SET(VTK_JAVA_JAR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/java/vtk.jar)
++  SET(VTK_JAVA_JAR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/java/vtk.jar)
+ ENDIF(VTK_WRAP_JAVA)
+ # VTK style script locations.
+-SET(VTK_DOXYGEN_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/doxygen)
+-SET(VTK_HEADER_TESTING_PY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/HeaderTesting.py)
+-SET(VTK_FIND_STRING_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/FindString.tcl)
+-SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/PrintSelfCheck.tcl)
+-SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/rtImageTest.tcl)
++SET(VTK_DOXYGEN_HOME_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/doxygen)
++SET(VTK_HEADER_TESTING_PY_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/HeaderTesting.py)
++SET(VTK_FIND_STRING_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/FindString.tcl)
++SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/PrintSelfCheck.tcl)
++SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/rtImageTest.tcl)
+ IF(VTK_USE_PARALLEL)
+-  SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/testing/prtImageTest.tcl)
++  SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/testing/prtImageTest.tcl)
+ ELSE(VTK_USE_PARALLEL)
+   SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG "")
+ ENDIF(VTK_USE_PARALLEL)
+@@ -191,11 +191,11 @@
+ # CMake extension module directory and macro file.
+ SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG
+-    "${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake/vtkLoadCMakeExtensions.cmake")
+-SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake)
++    "${CMAKE_INSTALL_PREFIX}/lib64/vtk/CMake/vtkLoadCMakeExtensions.cmake")
++SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib64/vtk/CMake)
+ # Library dependencies file.
+-SET(VTK_LIBRARY_DEPENDS_FILE "${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKLibraryDepends.cmake")
++SET(VTK_LIBRARY_DEPENDS_FILE "${CMAKE_INSTALL_PREFIX}/lib64/vtk/VTKLibraryDepends.cmake")
+ #-----------------------------------------------------------------------------
+ # Configure VTKConfig.cmake for the install tree.
+diff -Naur VTK-4.2.6-original/vtkMacros.cmake VTK-4.2.6-changed/vtkMacros.cmake
+--- VTK-4.2.6-original/vtkMacros.cmake 2003-01-27 19:15:03.000000000 +0300
++++ VTK-4.2.6-changed/vtkMacros.cmake  2006-10-03 17:42:06.000000000 +0400
+@@ -41,7 +41,7 @@
+     ENDIF (APPLE)
+     TARGET_LINK_LIBRARIES(vtk${KIT}TCL${VTK_VERSION} 
+        ${DEPEND} vtk${KIT}${VTK_VERSION} ${TCL_LIBRARY})
+-    INSTALL_TARGETS(/lib vtk${KIT}TCL${VTK_VERSION})
++    INSTALL_TARGETS(/lib64 vtk${KIT}TCL${VTK_VERSION})
+   ENDIF (VTK_WRAP_TCL)
+ ENDMACRO(VTK_USE_TCL)
+@@ -68,7 +68,7 @@
+     ENDIF(WIN32)
+     TARGET_LINK_LIBRARIES(vtk${KIT}Python${VTK_VERSION} 
+       vtk${KIT}${VTK_VERSION})
+-    INSTALL_TARGETS(/lib vtk${KIT}Python${VTK_VERSION})
++    INSTALL_TARGETS(/lib64 vtk${KIT}Python${VTK_VERSION})
+   ENDIF (VTK_WRAP_PYTHON)
+ ENDMACRO(VTK_USE_PYTHON)
+@@ -86,6 +86,6 @@
+     ADD_LIBRARY(vtk${KIT}Java${VTK_VERSION} SHARED ${${KIT}Java_SRCS})
+     TARGET_LINK_LIBRARIES (vtk${KIT}Java${VTK_VERSION} 
+        ${DEPEND} vtk${KIT}${VTK_VERSION})
+-    INSTALL_TARGETS(/lib vtk${KIT}Java${VTK_VERSION})
++    INSTALL_TARGETS(/lib64 vtk${KIT}Java${VTK_VERSION})
+   ENDIF (VTK_WRAP_JAVA)
+ ENDMACRO(VTK_USE_JAVA)
+diff -Naur VTK-4.2.6-original/Wrapping/Java/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Java/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Java/CMakeLists.txt    2003-07-29 21:47:09.000000000 +0400
++++ VTK-4.2.6-changed/Wrapping/Java/CMakeLists.txt     2006-10-04 14:07:46.000000000 +0400
+@@ -58,8 +58,8 @@
+     FOREACH(kit ${KITS})
+       IF(APPLE)
+-        SET(src ${LIBRARY_OUTPUT_PATH}/libvtk${kit}Java.dylib)
+-        SET(tgt ${LIBRARY_OUTPUT_PATH}/libvtk${kit}Java.jnilib)
++        SET(src ${LIBRARY_OUTPUT_PATH}/lib64vtk${kit}Java.dylib)
++        SET(tgt ${LIBRARY_OUTPUT_PATH}/lib64vtk${kit}Java.jnilib)
+         ADD_CUSTOM_COMMAND(SOURCE ${src}
+                              COMMAND ln
+                              ARGS -sf ${src} ${tgt}
+@@ -210,7 +210,7 @@
+         DEPENDS   ${LIBRARY_OUTPUT_PATH}/vtk.jar ${JAVA_TESTS}
+       )   
+-      INSTALL_FILES(/lib/vtk/java FILES ${LIBRARY_OUTPUT_PATH}/vtk.jar)
++      INSTALL_FILES(/lib64/vtk/java FILES ${LIBRARY_OUTPUT_PATH}/vtk.jar)
+     ENDIF(JAVA_ARCHIVE)
+   ENDIF(VTK_JAVA_NEW_STYLE)
+ ENDIF(JAVA_COMPILE)
+diff -Naur VTK-4.2.6-original/Wrapping/Python/setup.py.in VTK-4.2.6-changed/Wrapping/Python/setup.py.in
+--- VTK-4.2.6-original/Wrapping/Python/setup.py.in     2003-02-18 21:54:45.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Python/setup.py.in      2006-10-03 16:00:54.000000000 +0400
+@@ -22,7 +22,7 @@
+ # You can change this to suit your needs.  However you must make sure
+ # that under *nix the libvtk*Python*.so in the specified directory.
+-install_lib_dir = "${CMAKE_INSTALL_PREFIX}/lib/vtk"
++install_lib_dir = "${CMAKE_INSTALL_PREFIX}/lib64/vtk"
+ def get_libs():
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/CMakeLists.txt     2003-04-08 19:00:30.000000000 +0400
++++ VTK-4.2.6-changed/Wrapping/Tcl/CMakeLists.txt      2006-10-04 14:07:33.000000000 +0400
+@@ -83,8 +83,8 @@
+ # Process all packages
+ SUBDIRS(vtk vtkbase vtkcommon vtkfiltering vtkgraphics vtkimaging vtkinteraction vtkio vtktesting)
+-INSTALL_FILES(/lib/vtk/tcl "" README)
+-INSTALL_FILES(/lib/vtk/tcl .c vtktcl)
++INSTALL_FILES(/lib64/vtk/tcl "" README)
++INSTALL_FILES(/lib64/vtk/tcl .c vtktcl)
+ SET(VTK_TCL_RENDERING_CONFIG "")
+ SET(VTK_TCL_HYBRID_CONFIG "")
+@@ -142,7 +142,7 @@
+ CONFIGURE_FILE(${VTK_SOURCE_DIR}/Wrapping/Tcl/pkgIndex.tcl.in
+                ${VTK_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
+                @ONLY IMMEDIATE)
+-INSTALL_FILES(/lib/vtk/tcl FILES
++INSTALL_FILES(/lib64/vtk/tcl FILES
+               ${VTK_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl)
+ # Allow the user to customize their build with some local options
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtk/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtk/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtk/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtk/CMakeLists.txt  2006-10-04 14:06:09.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtk .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtk .tcl
+   vtk
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkbase/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkbase/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkbase/CMakeLists.txt     2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkbase/CMakeLists.txt      2006-10-04 14:06:17.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkbase .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkbase .tcl
+   vtkbase
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkcommon/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkcommon/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkcommon/CMakeLists.txt   2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkcommon/CMakeLists.txt    2006-10-04 14:06:23.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkcommon .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkcommon .tcl
+   vtkcommon
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkfiltering/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkfiltering/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkfiltering/CMakeLists.txt        2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkfiltering/CMakeLists.txt 2006-10-04 14:06:29.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkfiltering .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkfiltering .tcl
+   vtkfiltering
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkgraphics/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkgraphics/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkgraphics/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkgraphics/CMakeLists.txt  2006-10-04 14:06:34.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkgraphics .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkgraphics .tcl
+   vtkgraphics
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkhybrid/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkhybrid/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkhybrid/CMakeLists.txt   2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkhybrid/CMakeLists.txt    2006-10-04 14:06:41.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkhybrid .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkhybrid .tcl
+   vtkhybrid
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkimaging/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkimaging/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkimaging/CMakeLists.txt  2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkimaging/CMakeLists.txt   2006-10-04 14:06:47.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkimaging .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkimaging .tcl
+   vtkimaging
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkinteraction/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkinteraction/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkinteraction/CMakeLists.txt      2003-02-25 22:11:56.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkinteraction/CMakeLists.txt       2006-10-04 14:06:53.000000000 +0400
+@@ -1,4 +1,4 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkinteraction .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkinteraction .tcl
+   vtkinteraction
+   Interactor
+   bindings
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkio/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkio/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkio/CMakeLists.txt       2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkio/CMakeLists.txt        2006-10-04 14:06:59.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkio .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkio .tcl
+   vtkio
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkparallel/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkparallel/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkparallel/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkparallel/CMakeLists.txt  2006-10-04 14:07:05.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkparallel .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkparallel .tcl
+   vtkparallel
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkpatented/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkpatented/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkpatented/CMakeLists.txt 2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkpatented/CMakeLists.txt  2006-10-04 14:07:11.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkpatented .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkpatented .tcl
+   vtkpatented
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtkrendering/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtkrendering/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtkrendering/CMakeLists.txt        2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtkrendering/CMakeLists.txt 2006-10-04 14:07:17.000000000 +0400
+@@ -1,3 +1,3 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtkrendering .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtkrendering .tcl
+   vtkrendering
+ )
+diff -Naur VTK-4.2.6-original/Wrapping/Tcl/vtktesting/CMakeLists.txt VTK-4.2.6-changed/Wrapping/Tcl/vtktesting/CMakeLists.txt
+--- VTK-4.2.6-original/Wrapping/Tcl/vtktesting/CMakeLists.txt  2002-12-19 18:11:40.000000000 +0300
++++ VTK-4.2.6-changed/Wrapping/Tcl/vtktesting/CMakeLists.txt   2006-10-04 14:07:23.000000000 +0400
+@@ -1,4 +1,4 @@
+-INSTALL_FILES(/lib/vtk/tcl/vtktesting .tcl
++INSTALL_FILES(/lib64/vtk/tcl/vtktesting .tcl
+   vtktesting
+   backdrop
+   grab