--- CMakeLists.txt.orig 2005-12-16 16:22:29.000000000 +0100 +++ CMakeLists.txt 2006-08-25 21:35:39.000000000 +0200 @@ -384,18 +384,18 @@ # For installed tree usage SET(FLTK_FLUID_COMMAND "${CMAKE_INSTALL_PREFIX}/bin/fluid") -SET(FLTK_LIBRARY_DEPENDS_FILE ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKLibraryDepends.cmake) +SET(FLTK_LIBRARY_DEPENDS_FILE ${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/FLTK-${FLTK_VERSION}/FLTKLibraryDepends.cmake) SET(FLTK_EXECUTABLE_DIRS "${CMAKE_INSTALL_PREFIX}/bin") -SET(FLTK_LIBRARY_DIRS "${CMAKE_INSTALL_PREFIX}/lib") -SET(FLTK_USE_FILE "${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKUse.cmake") +SET(FLTK_LIBRARY_DIRS "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") +SET(FLTK_USE_FILE "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/FLTK-${FLTK_VERSION}/FLTKUse.cmake") SET(FLTK_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/") -SET(FLTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKBuildSettings.cmake) +SET(FLTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/FLTK-${FLTK_VERSION}/FLTKBuildSettings.cmake) SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(exec_prefix "${prefix}") SET(exec_prefix_set "no") SET(bindir "${prefix}/bin") SET(includedir "${prefix}") -SET(libdir "${prefix}/lib") +SET(libdir "${prefix}/${LIB_DIR}") SET(srcdir ".") CONFIGURE_FILE("${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in" @@ -404,7 +404,7 @@ "${FLTK_BINARY_DIR}/CMake/fltk-config" @ONLY IMMEDIATE) INSTALL_FILES(/include/FL FILES ${FLTK_HEADER_FILES}) -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_SOURCE_DIR}/CMake/FLTKUse.cmake") -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKBuildSettings.cmake") -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKLibraryDepends.cmake") -INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/CMake/FLTKConfig.cmake") +INSTALL_FILES(/${LIB_DIR}/FLTK-${FLTK_VERSION} FILES "${FLTK_SOURCE_DIR}/CMake/FLTKUse.cmake") +INSTALL_FILES(/${LIB_DIR}/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKBuildSettings.cmake") +INSTALL_FILES(/${LIB_DIR}/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/FLTKLibraryDepends.cmake") +INSTALL_FILES(/${LIB_DIR}/FLTK-${FLTK_VERSION} FILES "${FLTK_BINARY_DIR}/CMake/FLTKConfig.cmake")