From 29d0375f1d70d60da8aa2ab9863e2eee2afe27c6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 26 Apr 2016 02:19:24 +0000 Subject: [PATCH] change the way configuration directories are handled Signed-off-by: Ivailo Monev --- CMakeLists.txt | 19 +++++++++++++------ cmake/KatieConfig.cmake | 21 +++++++++++++++++++++ cmake/modules/KatieBuildMacros.cmake | 2 ++ mkspecs/freebsd/freebsd.cmake | 9 ++++++++- mkspecs/linux/linux.cmake | 7 +++++++ mkspecs/mkspecs.cmake | 14 ++++---------- mkspecs/win32/win32.cmake | 2 ++ package/archlinux-mingw/PKGBUILD | 13 ------------- package/archlinux/PKGBUILD | 14 ++------------ package/debian/rules | 20 -------------------- package/entropy/katie/SRCBUILD | 14 +------------- src/tools/designer/CMakeLists.txt | 5 +++-- src/tools/designer/designer.desktop.cmake | 4 ++-- src/tools/lrelease/CMakeLists.txt | 8 +++----- src/tools/lupdate/CMakeLists.txt | 8 +++----- src/tools/moc/CMakeLists.txt | 6 ++---- src/tools/qdbus/CMakeLists.txt | 8 +++----- src/tools/qdbusviewer/CMakeLists.txt | 4 ++-- src/tools/qdbusviewer/qdbusviewer.desktop.cmake | 4 ++-- 19 files changed, 80 insertions(+), 102 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b1e6eefd..b3fea205c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,6 +134,13 @@ add_feature_info(corewlan WITH_COREWLAN "an closed source something") include(mkspecs/mkspecs.cmake) +katie_generate_string("${LDCONF_INSTALL_PATH}" "LDCONF_INSTALL_PATH_STR" "LDCONF_INSTALL_PATH_INST") +katie_generate_string("${PROFILE_INSTALL_PATH}" "PROFILE_INSTALL_PATH_STR" "PROFILE_INSTALL_PATH_INST") +katie_generate_string("${MAN_INSTALL_PATH}" "MAN_INSTALL_PATH_STR" "MAN_INSTALL_PATH_INST") +katie_generate_string("${CMAKE_INSTALL_PATH}" "CMAKE_INSTALL_PATH_STR" "CMAKE_INSTALL_PATH_INST") +katie_generate_string("${APPLICATIONS_INSTALL_PATH}" "APPLICATIONS_INSTALL_PATH_STR" "APPLICATIONS_INSTALL_PATH_INST") +katie_generate_string("${PIXMAPS_INSTALL_PATH}" "PIXMAPS_INSTALL_PATH_STR" "PIXMAPS_INSTALL_PATH_INST") + katie_generate_string("qt_lcnsuser=${QT_LICENSE}" "QT_LICENSE_STR" "") katie_generate_string("qt_lcnsprod=${QT_PRODUCT}" "QT_PRODUCT_STR" "") katie_generate_string("qt_prfxpath=${QT_PREFIX_PATH}" "QT_PREFIX_PATH_STR" "") @@ -647,7 +654,7 @@ configure_file( install( DIRECTORY mkspecs - DESTINATION ${CMAKE_INSTALL_DIR}/Katie + DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie COMPONENT Devel ) @@ -656,21 +663,21 @@ install( ${CMAKE_BINARY_DIR}/KatieConfig.cmake ${CMAKE_BINARY_DIR}/KatieConfigVersion.cmake ${CMAKE_SOURCE_DIR}/cmake/modules/KatieMacros.cmake - DESTINATION ${CMAKE_INSTALL_DIR}/Katie + DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie COMPONENT Devel ) install( EXPORT KatieLibraryTargets NAMESPACE Katie:: - DESTINATION ${CMAKE_INSTALL_DIR}/Katie + DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie FILE KatieLibraryTargets.cmake ) install( EXPORT KatieBinaryTargets NAMESPACE Katie:: - DESTINATION ${CMAKE_INSTALL_DIR}/Katie + DESTINATION ${CMAKE_INSTALL_PATH_INST}/Katie FILE KatieBinaryTargets.cmake ) @@ -683,7 +690,7 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") ) install( FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf - DESTINATION ${LDCONF_INSTALL_DIR} + DESTINATION ${LDCONF_INSTALL_PATH_INST} ) endif() @@ -694,7 +701,7 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") ) install( FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh - DESTINATION ${PROFILE_INSTALL_DIR} + DESTINATION ${PROFILE_INSTALL_PATH_INST} ) endif() diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake index a50059704..c138d2192 100644 --- a/cmake/KatieConfig.cmake +++ b/cmake/KatieConfig.cmake @@ -52,6 +52,27 @@ endforeach() # Include macros, tools variables must be set before that include("${KATIE_CMAKE_DIR}/KatieMacros.cmake") +# The stored configuration paths that vendors usually change +set(LDCONF_INSTALL_PATH "@LDCONF_INSTALL_PATH@") +set(PROFILE_INSTALL_PATH "@PROFILE_INSTALL_PATH@") +set(MAN_INSTALL_PATH "@MAN_INSTALL_PATH@") +set(CMAKE_INSTALL_PATH "@CMAKE_INSTALL_PATH@") +set(APPLICATIONS_INSTALL_PATH "@APPLICATIONS_INSTALL_PATH@") +set(PIXMAPS_INSTALL_PATH "@PIXMAPS_INSTALL_PATH@") + +set(QT_PREFIX_PATH "@QT_PREFIX_PATH@") +set(QT_HEADERS_PATH "@QT_HEADERS_PATH@") +set(QT_LIBRARIES_PATH "@QT_LIBRARIES_PATH@") +set(QT_BINARIES_PATH "@QT_BINARIES_PATH@") +set(QT_PLUGINS_PATH "@QT_PLUGINS_PATH@") +set(QT_IMPORTS_PATH "@QT_IMPORTS_PATH@") +set(QT_DATA_PATH "@QT_DATA_PATH@") +set(QT_TRANSLATIONS_PATH "@QT_TRANSLATIONS_PATH@") +set(QT_DOCUMENTATION_PATH "@QT_DOCUMENTATION_PATH@") +set(QT_EXAMPLES_PATH "@QT_EXAMPLES_PATH@") +set(QT_DEMOS_PATH "@QT_DEMOS_PATH@") +set(QT_SETTINGS_PATH "@QT_SETTINGS_PATH@") + # Last but not least the platform specifiec stuff if(EXISTS ${KATIE_MKSPECS}) include(${KATIE_MKSPECS}) diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 91961ae93..f8e2d581c 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -106,6 +106,8 @@ function(KATIE_GENERATE_STRING INSTR OUTSTR OUTSTR2) if(OUTSTR2) string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" instpath ${INSTR}) string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}" "" instpath ${instpath}) + string(REGEX REPLACE ".*${SYSCONF_INSTALL_DIR}/" "" instpath ${instpath}) + string(REGEX REPLACE ".*${SYSCONF_INSTALL_DIR}" "" instpath ${instpath}) set(${OUTSTR2} "${instpath}" PARENT_SCOPE) endif() endfunction() diff --git a/mkspecs/freebsd/freebsd.cmake b/mkspecs/freebsd/freebsd.cmake index d73e6691c..fc0bc0ba3 100644 --- a/mkspecs/freebsd/freebsd.cmake +++ b/mkspecs/freebsd/freebsd.cmake @@ -9,6 +9,13 @@ set(KATIE_CXXFLAGS add_definitions(-D_THREAD_SAFE) +set(LDCONF_INSTALL_PATH "/etc/ld.so.conf.d") +set(PROFILE_INSTALL_PATH "/etc/profile.d") +set(MAN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/man") +set(CMAKE_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake") +set(APPLICATIONS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/applications") +set(PIXMAPS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/pixmaps") + set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include/katie") set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie") @@ -20,4 +27,4 @@ set(QT_TRANSLATIONS_PATH "${QT_DATA_PATH}/translations") set(QT_DOCUMENTATION_PATH "${QT_DATA_PATH}/doc") set(QT_EXAMPLES_PATH "${QT_DATA_PATH}/examples") set(QT_DEMOS_PATH "${QT_DATA_PATH}/demos") -set(QT_SETTINGS_PATH "/etc/xdg") \ No newline at end of file +set(QT_SETTINGS_PATH "/etc/xdg") diff --git a/mkspecs/linux/linux.cmake b/mkspecs/linux/linux.cmake index 5da4d6a6f..c8287b335 100644 --- a/mkspecs/linux/linux.cmake +++ b/mkspecs/linux/linux.cmake @@ -18,6 +18,13 @@ if("${KATIE_COMPILER}" MATCHES "(gcc|clang)") set(QT_VISIBILITY_AVAILABLE TRUE) endif() +set(LDCONF_INSTALL_PATH "${SYSCONF_INSTALL_DIR}/ld.so.conf.d") +set(PROFILE_INSTALL_PATH "${SYSCONF_INSTALL_DIR}/profile.d") +set(MAN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/man") +set(CMAKE_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake") +set(APPLICATIONS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/applications") +set(PIXMAPS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/pixmaps") + set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include/katie") set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie") diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake index fe733d6f0..b2ab8a88c 100644 --- a/mkspecs/mkspecs.cmake +++ b/mkspecs/mkspecs.cmake @@ -91,16 +91,10 @@ endif() include(${KATIE_MKSPECS_DIR}/tests/tests.cmake) -# vendors are free to change them, paths are relative to CMAKE_INSTALL_PREFIX -# otherwise CPack will attempt to install to the root directory on UNIX and -# fail to create the package. if vendors do not use CPack to generate their -# packages then paths can be full paths as seen in the shipped package files. -set(LDCONF_INSTALL_DIR "etc/ld.so.conf.d") -set(PROFILE_INSTALL_DIR "etc/profile.d") -set(MAN_INSTALL_DIR "share/man") -set(CMAKE_INSTALL_DIR "cmake") -set(APPLICATIONS_INSTALL_DIR "share/applications") -set(PIXMAPS_INSTALL_DIR "share/pixmaps") +if(NOT SYSCONF_INSTALL_DIR) + # FIXME: right now SYSCONF_INSTALL_DIR is silent requirement + set(SYSCONF_INSTALL_DIR "/etc") +endif() if(NOT KATIE_KEY) set(KATIE_KEY "${KATIE_ARCHITECTURE} ${KATIE_PLATFORM} ${KATIE_COMPILER} full-config") diff --git a/mkspecs/win32/win32.cmake b/mkspecs/win32/win32.cmake index c77d5a1bf..8bae274cf 100644 --- a/mkspecs/win32/win32.cmake +++ b/mkspecs/win32/win32.cmake @@ -7,6 +7,8 @@ endif() set(KATIE_TOOLS "${KATIE_TOOLS} idc") set(KATIE_COMPONENTS "${KATIE_COMPONENTS} Main") +set(CMAKE_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/cmake") + set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}") set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include") set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib") diff --git a/package/archlinux-mingw/PKGBUILD b/package/archlinux-mingw/PKGBUILD index 1b9e9c79f..2b773b57d 100644 --- a/package/archlinux-mingw/PKGBUILD +++ b/package/archlinux-mingw/PKGBUILD @@ -24,19 +24,6 @@ pkgver() { prepare() { mkdir -p build - - echo "set(CMAKE_INSTALL_DIR /usr/${_arch}/share/cmake)" \ - >> katie/mkspecs/win32/vendor.cmake - echo 'set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie")' \ - >> katie/mkspecs/win32/vendor.cmake - echo 'set(QT_PLUGINS_PATH "${QT_LIBRARIES_PATH}/plugins")' \ - >> katie/mkspecs/win32/vendor.cmake - echo 'set(QT_IMPORTS_PATH "${QT_LIBRARIES_PATH}/imports")' \ - >> katie/mkspecs/win32/vendor.cmake - echo 'set(QT_BINARIES_PATH "${QT_LIBRARIES_PATH}/bin")' \ - >> katie/mkspecs/win32/vendor.cmake - echo 'set(QT_DATA_PATH "${QT_PREFIX_PATH}/share")' \ - >> katie/mkspecs/win32/vendor.cmake } build() { diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index be6639f92..e2d536500 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -29,17 +29,6 @@ pkgver() { prepare() { mkdir -p build - - echo 'set(LDCONF_INSTALL_DIR /etc/ld.so.conf.d)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(PROFILE_INSTALL_DIR /etc/profile.d)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(APPLICATIONS_INSTALL_DIR /usr/share/applications)' \ - >> katie/mkspecs/linux/vendor.cmake - echo 'set(PIXMAPS_INSTALL_DIR /usr/share/pixmaps)' \ - >> katie/mkspecs/linux/vendor.cmake } build() { @@ -47,7 +36,8 @@ build() { cmake ../katie \ -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc make } diff --git a/package/debian/rules b/package/debian/rules index 414d0402e..4e3352481 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -4,26 +4,6 @@ dh $@ override_dh_auto_configure: - echo 'set(LDCONF_INSTALL_DIR /etc/ld.so.conf.d)' \ - > mkspecs/linux/vendor.cmake - echo 'set(PROFILE_INSTALL_DIR /etc/profile.d)' \ - >> mkspecs/linux/vendor.cmake - echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \ - >> mkspecs/linux/vendor.cmake - echo 'set(APPLICATIONS_INSTALL_DIR /usr/share/applications)' \ - >> mkspecs/linux/vendor.cmake - echo 'set(PIXMAPS_INSTALL_DIR /usr/share/pixmaps)' \ - >> mkspecs/linux/vendor.cmake - - echo "set(QT_LIBRARIES_PATH /usr/lib/${DEB_TARGET_MULTIARCH}/katie)" \ - >> mkspecs/linux/vendor.cmake - echo "set(QT_BINARIES_PATH /usr/lib/${DEB_TARGET_MULTIARCH}/katie/bin)" \ - >> mkspecs/linux/vendor.cmake - echo "set(QT_PLUGINS_PATH /usr/lib/${DEB_TARGET_MULTIARCH}/katie/plugins)" \ - >> mkspecs/linux/vendor.cmake - echo "set(QT_IMPORTS_PATH /usr/lib/${DEB_TARGET_MULTIARCH}/katie/imports)" \ - >> mkspecs/linux/vendor.cmake - # the mysqld library is not much of a static dh_auto_configure -- -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" -Wno-dev diff --git a/package/entropy/katie/SRCBUILD b/package/entropy/katie/SRCBUILD index 4913efd34..fd99f0fad 100644 --- a/package/entropy/katie/SRCBUILD +++ b/package/entropy/katie/SRCBUILD @@ -10,19 +10,6 @@ makedepends=('python') optdepends=('gtk2' 'mariadb' 'unixodbc' 'postgresql' 'nas') sources=("https://github.com/fluxer/katie.git") -src_prepare() { - echo 'set(LDCONF_INSTALL_DIR /etc/ld.so.conf.d)' \ - >> katie.git/mkspecs/linux/vendor.cmake - echo 'set(PROFILE_INSTALL_DIR /etc/profile.d)' \ - >> katie.git/mkspecs/linux/vendor.cmake - echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \ - >> katie.git/mkspecs/linux/vendor.cmake - echo 'set(APPLICATIONS_INSTALL_DIR /usr/share/applications)' \ - >> katie.git/mkspecs/linux/vendor.cmake - echo 'set(PIXMAPS_INSTALL_DIR /usr/share/pixmaps)' \ - >> katie.git/mkspecs/linux/vendor.cmake -} - src_compile() { mkdir -p build && cd build @@ -30,6 +17,7 @@ src_compile() { -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ -DWITH_GTK2=$OPTIONAL_GTK2_BOOL \ -DWITH_MYSQL=$OPTIONAL_MARIADB_BOOL \ -DWITH_ODBC=$OPTIONAL_UNIXODBC_BOOL \ diff --git a/src/tools/designer/CMakeLists.txt b/src/tools/designer/CMakeLists.txt index b5146e62c..93c1ed8d8 100644 --- a/src/tools/designer/CMakeLists.txt +++ b/src/tools/designer/CMakeLists.txt @@ -103,6 +103,7 @@ install( COMPONENT Devel ) +message(STATUS "${APPLICATIONS_INSTALL_PATH_INST}, ${PIXMAPS_INSTALL_PATH_INST}") if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/designer.desktop.cmake @@ -111,12 +112,12 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") ) install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop - DESTINATION ${APPLICATIONS_INSTALL_DIR} + DESTINATION ${APPLICATIONS_INSTALL_PATH_INST} COMPONENT Devel ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/designer.png - DESTINATION ${PIXMAPS_INSTALL_DIR} + DESTINATION ${PIXMAPS_INSTALL_PATH_INST} COMPONENT Devel ) endif() diff --git a/src/tools/designer/designer.desktop.cmake b/src/tools/designer/designer.desktop.cmake index 3da3973de..74a6421a0 100644 --- a/src/tools/designer/designer.desktop.cmake +++ b/src/tools/designer/designer.desktop.cmake @@ -1,8 +1,8 @@ [Desktop Entry] Name=Katie Designer Comment=Design GUIs for Katie applications -Exec=@QT_BINARIES_PATH_INST@/designer -Icon=@PIXMAPS_INSTALL_DIR@/designer.png +Exec=@QT_BINARIES_PATH@/designer +Icon=@PIXMAPS_INSTALL_PATH@/designer.png MimeType=application/x-designer; Terminal=false Encoding=UTF-8 diff --git a/src/tools/lrelease/CMakeLists.txt b/src/tools/lrelease/CMakeLists.txt index b1f5be9df..b75d60b5a 100644 --- a/src/tools/lrelease/CMakeLists.txt +++ b/src/tools/lrelease/CMakeLists.txt @@ -41,11 +41,9 @@ install( COMPONENT Devel ) -if(NOT "${KATIE_PLATFORM}" MATCHES "(win32|wince|mac)") +if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.1 - DESTINATION - ${MAN_INSTALL_DIR}/man1 + FILES ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.1 + DESTINATION ${MAN_INSTALL_PATH_INST}/man1 ) endif() diff --git a/src/tools/lupdate/CMakeLists.txt b/src/tools/lupdate/CMakeLists.txt index 0a8c3cae9..10b70ee5a 100644 --- a/src/tools/lupdate/CMakeLists.txt +++ b/src/tools/lupdate/CMakeLists.txt @@ -41,11 +41,9 @@ install( COMPONENT Devel ) -if(NOT "${KATIE_PLATFORM}" MATCHES "(win32|wince|mac)") +if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.1 - DESTINATION - ${MAN_INSTALL_DIR}/man1 + FILES ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.1 + DESTINATION ${MAN_INSTALL_PATH_INST}/man1 ) endif() diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index a45cd9560..8ca912796 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -52,9 +52,7 @@ install( if(NOT "${KATIE_PLATFORM}" MATCHES "(win32|wince|mac)") install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/moc.1 - DESTINATION - ${MAN_INSTALL_DIR}/man1 + FILES ${CMAKE_CURRENT_SOURCE_DIR}/moc.1 + DESTINATION ${MAN_INSTALL_PATH_INST}/man1 ) endif() diff --git a/src/tools/qdbus/CMakeLists.txt b/src/tools/qdbus/CMakeLists.txt index 596fb01e5..1c2540a43 100644 --- a/src/tools/qdbus/CMakeLists.txt +++ b/src/tools/qdbus/CMakeLists.txt @@ -39,11 +39,9 @@ install( COMPONENT Devel ) -if(NOT "${KATIE_PLATFORM}" MATCHES "(win32|wince|mac)") +if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") install( - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.1 - DESTINATION - ${MAN_INSTALL_DIR}/man1 + FILES ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.1 + DESTINATION ${MAN_INSTALL_PATH_INST}/man1 ) endif() diff --git a/src/tools/qdbusviewer/CMakeLists.txt b/src/tools/qdbusviewer/CMakeLists.txt index e56e2420f..3a6a1faa8 100644 --- a/src/tools/qdbusviewer/CMakeLists.txt +++ b/src/tools/qdbusviewer/CMakeLists.txt @@ -55,12 +55,12 @@ if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)") ) install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop - DESTINATION ${APPLICATIONS_INSTALL_DIR} + DESTINATION ${APPLICATIONS_INSTALL_PATH_INST} COMPONENT Devel ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/qdbusviewer.png - DESTINATION ${PIXMAPS_INSTALL_DIR} + DESTINATION ${PIXMAPS_INSTALL_PATH_INST} COMPONENT Devel ) endif() diff --git a/src/tools/qdbusviewer/qdbusviewer.desktop.cmake b/src/tools/qdbusviewer/qdbusviewer.desktop.cmake index 26867259c..2e2ae5e88 100644 --- a/src/tools/qdbusviewer/qdbusviewer.desktop.cmake +++ b/src/tools/qdbusviewer/qdbusviewer.desktop.cmake @@ -1,8 +1,8 @@ [Desktop Entry] Name=Katie D-Bus Viewer Comment=Debug D-Bus applications -Exec=@QT_BINARIES_PATH_INST@/qdbusviewer -Icon=@PIXMAPS_INSTALL_DIR@/qdbusviewer.png +Exec=@QT_BINARIES_PATH@/qdbusviewer +Icon=@PIXMAPS_INSTALL_PATH@/qdbusviewer.png Terminal=false Encoding=UTF-8 Type=Application -- 2.11.0