From b7497e8b335befbd043730a2833e8c15461482ff Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 25 Nov 2019 17:09:43 +0000 Subject: Explicitly use lib for systemd directories Systemd searches "/usr/local/lib/systemd/user", "/usr/local/share/systemd/user", USER_DATA_UNIT_PATH, "/usr/lib/systemd/user", "/usr/share/systemd/user", LIBDIR could be lib or lib64, so we need to be explicit here. Reviewed on D25107 --- kde-modules/KDEInstallDirs.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kde-modules/KDEInstallDirs.cmake') diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index ffe0ea6a..59e39d94 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -133,11 +133,11 @@ # ``JARDIR`` # Java AAR/JAR files for Android. Since 5.62.0 # ``SYSTEMDUNITDIR`` -# Systemd Units (``LIBDIR/systemd``) -# [``SYSTEMD_UNIT_INSTALL_DIR``]. Since 5.FIXME +# Systemd Units (``lib/systemd``) +# [``SYSTEMD_UNIT_INSTALL_DIR``]. Since 5.65 # ``SYSTEMDUSERUNITDIR`` -# Systemd User Units (``LIBDIR/systemd/user``) -# [``SYSTEMD_USER_UNIT_INSTALL_DIR``]. Since 5.FIXME +# Systemd User Units (``lib/systemd/user``) +# [``SYSTEMD_USER_UNIT_INSTALL_DIR``]. Since 5.65 # # If ``KDE_INSTALL_USE_QT_SYS_PATHS`` is set to TRUE before including this # module, the default values for some variables are instead queried from @@ -646,7 +646,7 @@ _define_relative(DBUSSERVICEDIR DBUSDIR "services" _define_relative(DBUSSYSTEMSERVICEDIR DBUSDIR "system-services" "D-Bus system services" DBUS_SYSTEM_SERVICES_INSTALL_DIR) -_define_relative(SYSTEMDUNITDIR LIBDIR "systemd" +_define_relative(SYSTEMDUNITDIR CMAKE_INSTALL_PREFIX "lib/systemd" "Systemd units" SYSTEMD_UNIT_INSTALL_DIR) _define_relative(SYSTEMDUSERUNITDIR SYSTEMDUNITDIR "user" -- cgit v1.2.1