--- OpenCV-2.3.0-old/CMakeLists.txt 2011-07-04 14:21:50.000000000 +1000 +++ OpenCV-2.3.0/CMakeLists.txt 2011-07-15 19:17:46.871379490 +1000 @@ -25,7 +25,7 @@ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") endif() -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) @@ -623,7 +623,8 @@ if(APPLE) set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") else() #debian based assumed, install to the dist-packages. - set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") +# set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") + set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") endif() endif() if(WIN32) @@ -1191,7 +1192,7 @@ # PROCESS SUBDIRECTORIES: # ---------------------------------------------------------------------------- # Save libs and executables in the same place -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" ) +set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries" ) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" ) if(WIN32) @@ -1327,14 +1328,14 @@ # ------------------------------------------------------------------------------------------- set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") -set(libdir "\${exec_prefix}/lib") +set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") set(includedir "\${prefix}/include") set(VERSION ${OPENCV_VERSION}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE) if(UNIX) - install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig) + install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) endif() --- OpenCV-2.3.0-old/OpenCVModule.cmake 2011-07-04 14:21:59.000000000 +1000 +++ OpenCV-2.3.0/OpenCVModule.cmake 2011-07-15 19:38:35.442071816 +1000 @@ -97,8 +97,8 @@ install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main - LIBRARY DESTINATION lib COMPONENT main - ARCHIVE DESTINATION lib COMPONENT main) + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) install(FILES ${lib_hdrs} DESTINATION include/opencv2/${name} --- OpenCV-2.3.0-old/modules/highgui/CMakeLists.txt 2011-07-04 14:21:58.000000000 +1000 +++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt 2011-07-15 20:06:43.172489920 +1000 @@ -362,8 +362,8 @@ install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main - LIBRARY DESTINATION lib COMPONENT main - ARCHIVE DESTINATION lib COMPONENT main) + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) install(FILES ${highgui_ext_hdrs} DESTINATION include/opencv2/highgui --- OpenCV-2.3.0-old/modules/gpu/CMakeLists.txt 2011-07-04 14:21:58.000000000 +1000 +++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt 2011-07-15 20:08:50.185009691 +1000 @@ -149,8 +149,8 @@ install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main - LIBRARY DESTINATION lib COMPONENT main - ARCHIVE DESTINATION lib COMPONENT main) + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) install(FILES ${lib_hdrs} DESTINATION include/opencv2/${name}