From 94d2fea23a312380a40bcb683387b210a0ffe6a1 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Fri, 17 May 2019 18:56:27 +0200 Subject: [PATCH] Move knsrc files to the new location Instead of the old legacy /etc/xdg location Differential Revision: https://phabricator.kde.org/D21254 --- kcmkwin/kwindecoration/CMakeLists.txt | 2 +- kcmkwin/kwineffects/CMakeLists.txt | 2 +- kcmkwin/kwinscripts/CMakeLists.txt | 2 +- kcmkwin/kwintabbox/CMakeLists.txt | 2 +- plugins/kdecorations/aurorae/src/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index c4a4808c55..461e858fb0 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -24,7 +24,7 @@ kcoreaddons_desktop_to_json(kcm_kwindecoration "kwindecoration.desktop" SERVICE_ # This desktop file is installed only for retrocompatibility with sycoca install(FILES kwindecoration.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) -install(FILES window-decorations.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) +install(FILES window-decorations.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) install(TARGETS kcm_kwindecoration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) kpackage_install_package(package kcm_kwindecoration kcms) diff --git a/kcmkwin/kwineffects/CMakeLists.txt b/kcmkwin/kwineffects/CMakeLists.txt index 19c9ba2296..4a554a4b85 100644 --- a/kcmkwin/kwineffects/CMakeLists.txt +++ b/kcmkwin/kwineffects/CMakeLists.txt @@ -29,5 +29,5 @@ kcoreaddons_desktop_to_json(kcm_kwin_effects "kcm_kwin_effects.desktop") install(TARGETS kcm_kwin_effects DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES kcm_kwin_effects.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) -install(FILES kwineffect.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES kwineffect.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) kpackage_install_package(package kcm_kwin_effects kcms) diff --git a/kcmkwin/kwinscripts/CMakeLists.txt b/kcmkwin/kwinscripts/CMakeLists.txt index e21879bcb6..66145e9e00 100644 --- a/kcmkwin/kwinscripts/CMakeLists.txt +++ b/kcmkwin/kwinscripts/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(kcm_kwin_scripts install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES kwinscripts.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES kwinscripts.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install(FILES kwinscripts.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/kcmkwin/kwintabbox/CMakeLists.txt b/kcmkwin/kwintabbox/CMakeLists.txt index b4d51027f8..b6b932b0fe 100644 --- a/kcmkwin/kwintabbox/CMakeLists.txt +++ b/kcmkwin/kwintabbox/CMakeLists.txt @@ -37,4 +37,4 @@ install(TARGETS kcm_kwintabbox DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES kwintabbox.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES thumbnails/konqueror.png thumbnails/kmail.png thumbnails/systemsettings.png thumbnails/dolphin.png DESTINATION ${DATA_INSTALL_DIR}/kwin/kcm_kwintabbox) -install( FILES kwinswitcher.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES kwinswitcher.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} ) diff --git a/plugins/kdecorations/aurorae/src/CMakeLists.txt b/plugins/kdecorations/aurorae/src/CMakeLists.txt index 159add0cb5..ea032d473a 100644 --- a/plugins/kdecorations/aurorae/src/CMakeLists.txt +++ b/plugins/kdecorations/aurorae/src/CMakeLists.txt @@ -44,7 +44,7 @@ install(TARGETS decorationplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/dec ########### install files ############### -install( FILES aurorae.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES aurorae.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} ) install( FILES qml/aurorae.qml qml/AuroraeButton.qml