diff options
-rw-r--r-- | CMakeLists.txt | 26 | ||||
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | doc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | doc/de/CMakeLists.txt | 6 | ||||
-rw-r--r-- | doc/en/CMakeLists.txt | 12 | ||||
-rw-r--r-- | doc/fr/CMakeLists.txt | 12 | ||||
-rw-r--r-- | doc/pl/CMakeLists.txt | 6 | ||||
-rw-r--r-- | po/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/plugins/alias/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/aspell/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/charset/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/demo/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/fifo/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/irc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/logger/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/relay/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/scripts/lua/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/scripts/perl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/scripts/python/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/scripts/ruby/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/scripts/tcl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/xfer/CMakeLists.txt | 2 |
23 files changed, 60 insertions, 42 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f381d972b..8f929f78f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,12 +31,28 @@ SET(VERSION_MINOR "3") SET(VERSION_PATCH "1-dev") SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) SET(PKG_STRING "${PROJECT_NAME} ${VERSION}") -SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}) -SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}) -SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) -SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING}) +IF(DEFINED LIBDIR) + SET(LIBDIR ${LIBDIR}/${PROJECT_NAME}) +ELSE(DEFINED LIBDIR) + SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}) +ENDIF(DEFINED LIBDIR) + +IF(NOT DEFINED SHAREDIR) + SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share) +ENDIF(NOT DEFINED SHAREDIR) + +IF(NOT DEFINED LOCALEDIR) + SET(LOCALEDIR ${SHAREDIR}/locale) +ENDIF(NOT DEFINED LOCALEDIR) + +IF(DEFINED INCLUDEDIR) + SET(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME}) +ELSE(DEFINED INCLUDEDIR) + SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) +ENDIF(DEFINED INCLUDEDIR) + OPTION(DISABLE_NCURSES "Disable Ncurses interface") OPTION(ENABLE_GTK "Enable GTK interface") OPTION(DISABLE_NLS "Disable Native Language Support") @@ -93,7 +109,7 @@ SET(exec_prefix "\${prefix}") SET(libdir "\${exec_prefix}/lib") SET(includedir "\${prefix}/include") CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig) # packages SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client") @@ -7,6 +7,8 @@ v0.3.1-dev, 2009-09-20 Version 0.3.1 (under dev!) -------------------------- +* core: fix cmake directories: let user customize lib, share, locale and include + directories (patch #6922) * core: fix plural form in translation files (bug #27430) * core: fix terminal title bug: do not reset it when option weechat.look.set_title is off (bug #27399) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f0d9c2cfb..cb16d211d 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -27,4 +27,4 @@ IF(NOT DISABLE_DOC) ENDIF(NOT DISABLE_DOC) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION share/man/man1) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${SHAREDIR}/man/man1) diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt index 6bf33fa0f..d48121f61 100644 --- a/doc/de/CMakeLists.txt +++ b/doc/de/CMakeLists.txt @@ -23,7 +23,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_faq.de.html" ) ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # quickstart ADD_CUSTOM_COMMAND( @@ -34,7 +34,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_quickstart.de.html" ) ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # tester's guide ADD_CUSTOM_COMMAND( @@ -45,4 +45,4 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_tester.de.html" ) ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index 855ec73ea..5f0c236e5 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_user.en.html" ) ADD_CUSTOM_TARGET(doc-user-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # plugin API reference ADD_CUSTOM_COMMAND( @@ -36,7 +36,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_plugin_api.en.html" ) ADD_CUSTOM_TARGET(doc-plugin-api-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # scripting guide ADD_CUSTOM_COMMAND( @@ -47,7 +47,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_scripting.en.html" ) ADD_CUSTOM_TARGET(doc-scripting-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # FAQ ADD_CUSTOM_COMMAND( @@ -58,7 +58,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_faq.en.html" ) ADD_CUSTOM_TARGET(doc-faq-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # quickstart ADD_CUSTOM_COMMAND( @@ -69,7 +69,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_quickstart.en.html" ) ADD_CUSTOM_TARGET(doc-quickstart-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # tester's guide ADD_CUSTOM_COMMAND( @@ -80,4 +80,4 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_tester.en.html" ) ADD_CUSTOM_TARGET(doc-tester-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt index 6678a0e2d..17e887372 100644 --- a/doc/fr/CMakeLists.txt +++ b/doc/fr/CMakeLists.txt @@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_user.fr.html" ) ADD_CUSTOM_TARGET(doc-user-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # plugin API reference ADD_CUSTOM_COMMAND( @@ -36,7 +36,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_plugin_api.fr.html" ) ADD_CUSTOM_TARGET(doc-plugin-api-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # scripting guide ADD_CUSTOM_COMMAND( @@ -47,7 +47,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_scripting.fr.html" ) ADD_CUSTOM_TARGET(doc-scripting-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # FAQ ADD_CUSTOM_COMMAND( @@ -58,7 +58,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_faq.fr.html" ) ADD_CUSTOM_TARGET(doc-faq-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # quickstart ADD_CUSTOM_COMMAND( @@ -69,7 +69,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_quickstart.fr.html" ) ADD_CUSTOM_TARGET(doc-quickstart-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # tester's guide ADD_CUSTOM_COMMAND( @@ -80,4 +80,4 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_tester.fr.html" ) ADD_CUSTOM_TARGET(doc-tester-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) diff --git a/doc/pl/CMakeLists.txt b/doc/pl/CMakeLists.txt index 14cdca2d2..6e0791f7a 100644 --- a/doc/pl/CMakeLists.txt +++ b/doc/pl/CMakeLists.txt @@ -23,7 +23,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_faq.pl.html" ) ADD_CUSTOM_TARGET(doc-faq-pl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.pl.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.pl.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.pl.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # quickstart ADD_CUSTOM_COMMAND( @@ -34,7 +34,7 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_quickstart.pl.html" ) ADD_CUSTOM_TARGET(doc-quickstart-pl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.pl.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.pl.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.pl.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) # tester's guide ADD_CUSTOM_COMMAND( @@ -45,4 +45,4 @@ ADD_CUSTOM_COMMAND( COMMENT "Building weechat_tester.pl.html" ) ADD_CUSTOM_TARGET(doc-tester-pl ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.pl.html) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.pl.html DESTINATION share/doc/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.pl.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index d43d3e77b..df087bd26 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -69,7 +69,7 @@ IF(XGETTEXT_EXECUTABLE AND MSGMERGE_EXECUTABLE AND MSGFMT_EXECUTABLE) COMMENT "Compiling locales (${polang})" ) - INSTALL(FILES ${gmofile} DESTINATION share/locale/${polang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) + INSTALL(FILES ${gmofile} DESTINATION ${LOCALEDIR}/${polang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) SET(GMO_FILES ${GMO_FILES} ${gmofile}) ENDFOREACH(pofile ${PO_FILES}) ADD_CUSTOM_TARGET(translations ALL DEPENDS ${GMO_FILES}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 50d2f019a..df2e92c6f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -105,12 +105,12 @@ IF(DL_LIBRARY) LIST(APPEND EXTRA_LIBS dl) ENDIF(DL_LIBRARY) -if(COMMAND cmake_policy) +IF(COMMAND cmake_policy) cmake_policy(SET CMP0005 NEW) ADD_DEFINITIONS(-DWEECHAT_VERSION="${VERSION}") -else(COMMAND cmake_policy) +ELSE(COMMAND cmake_policy) ADD_DEFINITIONS(-DWEECHAT_VERSION='"${VERSION}"') -endif(COMMAND cmake_policy) +ENDIF(COMMAND cmake_policy) ADD_SUBDIRECTORY( core ) LIST(APPEND STATIC_LIBS weechat_core) diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt index e863cf757..3fea3a51d 100644 --- a/src/plugins/alias/CMakeLists.txt +++ b/src/plugins/alias/CMakeLists.txt @@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(alias) -INSTALL(TARGETS alias LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS alias LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt index 1141ccd86..c6bd05135 100644 --- a/src/plugins/aspell/CMakeLists.txt +++ b/src/plugins/aspell/CMakeLists.txt @@ -25,4 +25,4 @@ IF(ASPELL_FOUND) TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY}) ENDIF(ASPELL_FOUND) -INSTALL(TARGETS aspell LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS aspell LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt index fdfd2e937..dd97e526b 100644 --- a/src/plugins/charset/CMakeLists.txt +++ b/src/plugins/charset/CMakeLists.txt @@ -26,4 +26,4 @@ IF(ICONV_FOUND) ENDIF(ICONV_LIBRARY) ENDIF(ICONV_FOUND) -INSTALL(TARGETS charset LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS charset LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/demo/CMakeLists.txt b/src/plugins/demo/CMakeLists.txt index 0e3a26880..165dc88b7 100644 --- a/src/plugins/demo/CMakeLists.txt +++ b/src/plugins/demo/CMakeLists.txt @@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(demo) -INSTALL(TARGETS demo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS demo LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt index 5f8e83188..6fbab994e 100644 --- a/src/plugins/fifo/CMakeLists.txt +++ b/src/plugins/fifo/CMakeLists.txt @@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(fifo) -INSTALL(TARGETS fifo LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS fifo LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt index ace1da002..fe8d18e95 100644 --- a/src/plugins/irc/CMakeLists.txt +++ b/src/plugins/irc/CMakeLists.txt @@ -47,4 +47,4 @@ ELSE(GNUTLS_FOUND) TARGET_LINK_LIBRARIES(irc) ENDIF(GNUTLS_FOUND) -INSTALL(TARGETS irc LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS irc LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt index 16d3e8086..cb7769038 100644 --- a/src/plugins/logger/CMakeLists.txt +++ b/src/plugins/logger/CMakeLists.txt @@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(logger) -INSTALL(TARGETS logger LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS logger LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt index 662223909..e42025b9d 100644 --- a/src/plugins/relay/CMakeLists.txt +++ b/src/plugins/relay/CMakeLists.txt @@ -27,4 +27,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(relay) -INSTALL(TARGETS relay LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS relay LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/scripts/lua/CMakeLists.txt b/src/plugins/scripts/lua/CMakeLists.txt index cde09e646..e64fa92ca 100644 --- a/src/plugins/scripts/lua/CMakeLists.txt +++ b/src/plugins/scripts/lua/CMakeLists.txt @@ -28,4 +28,4 @@ IF(LUA_FOUND) ENDIF(LUA_LIBRARY AND LUALIB_LIBRARY) ENDIF(LUA_FOUND) -INSTALL(TARGETS lua LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS lua LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt index 52950cfff..ccc0b00fc 100644 --- a/src/plugins/scripts/perl/CMakeLists.txt +++ b/src/plugins/scripts/perl/CMakeLists.txt @@ -35,4 +35,4 @@ IF(PERL_FOUND) ENDIF(PERL_DYNALOADER) ENDIF(PERL_FOUND) -INSTALL(TARGETS perl LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS perl LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/scripts/python/CMakeLists.txt b/src/plugins/scripts/python/CMakeLists.txt index 8495c3290..33ff07edd 100644 --- a/src/plugins/scripts/python/CMakeLists.txt +++ b/src/plugins/scripts/python/CMakeLists.txt @@ -25,4 +25,4 @@ IF(PYTHON_FOUND) TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts) ENDIF(PYTHON_FOUND) -INSTALL(TARGETS python LIBRARY DESTINATION lib/weechat/plugins) +INSTALL(TARGETS python LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/scripts/ruby/CMakeLists.txt b/src/plugins/scripts/ruby/CMakeLists.txt index 452e47907..cf977a254 100644 --- a/src/plugins/scripts/ruby/CMakeLists.txt +++ b/src/plugins/scripts/ruby/CMakeLists.txt @@ -24,4 +24,4 @@ IF(RUBY_FOUND) TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts) ENDIF(RUBY_FOUND) -INSTALL(TARGETS ruby LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS ruby LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/scripts/tcl/CMakeLists.txt b/src/plugins/scripts/tcl/CMakeLists.txt index 58cbaa27f..1302bd4e0 100644 --- a/src/plugins/scripts/tcl/CMakeLists.txt +++ b/src/plugins/scripts/tcl/CMakeLists.txt @@ -29,4 +29,4 @@ IF(TCL_FOUND) ENDIF(TCL_FOUND) -INSTALL(TARGETS tcl LIBRARY DESTINATION lib/weechat/plugins) +INSTALL(TARGETS tcl LIBRARY DESTINATION ${LIBDIR}/plugins) diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt index 4d8e8f543..b7180a43d 100644 --- a/src/plugins/xfer/CMakeLists.txt +++ b/src/plugins/xfer/CMakeLists.txt @@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "") TARGET_LINK_LIBRARIES(xfer) -INSTALL(TARGETS xfer LIBRARY DESTINATION lib/${PROJECT_NAME}/plugins) +INSTALL(TARGETS xfer LIBRARY DESTINATION ${LIBDIR}/plugins) |