--- src/libprojectM/CMakeLists.txt.orig 2012-05-20 03:43:26.000000000 +0000 +++ src/libprojectM/CMakeLists.txt 2014-08-29 03:36:28.593809096 +0000 @@ -35,7 +35,7 @@ ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") -SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" +SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" FORCE) @@ -234,7 +234,7 @@ FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM) -INSTALL(TARGETS projectM DESTINATION lib) +INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX}) --- src/projectM-qt/CMakeLists.txt.orig 2012-05-20 03:43:25.000000000 +0000 +++ src/projectM-qt/CMakeLists.txt 2014-08-29 03:37:40.050705339 +0000 @@ -131,6 +131,6 @@ target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES}) install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt) -install(TARGETS projectM-qt DESTINATION lib) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig) +install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX}) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig) install(FILES "images/icons/prjm16-transparent.svg" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)