From 2ec165030b2947e6a4e1b29843b20fbff17aaa1f Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 11 Feb 2014 21:53:02 +0000 Subject: Install app desktop files to share/applications, not in a kde5 subdir Given that binaries are all installed in PREFIX/bin, and have to avoid clashes, doing the same for desktop files is no great issue, and installing into a subdirectory of applications/ just complicates matters for client code that needs to refer to the desktop file (is it "kde5-foo[.desktop]", "kde5/foo[.desktop]" or just "foo[.desktop]"?). REVIEW: 115683 --- kde-modules/KDEInstallDirs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 46e15c17..1a758c8d 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -142,7 +142,7 @@ _set_fancy(TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" _set_fancy(WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" "The install dir for wallpapers") _set_fancy(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update" "The kconf_update install dir") -_set_fancy(XDG_APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications/kde5" "The XDG apps dir") +_set_fancy(XDG_APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications" "The XDG apps dir") _set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories" "The XDG directory") _set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes") -- cgit v1.2.1