From e92da3387bdca560074656b65e3367f9c4086d4c Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 7 Nov 2014 15:07:31 +0000 Subject: Set CMAKE_INSTALL_SYSCONFDIR to /etc when CMAKE_INSTALL_PREFIX is /usr When installing to /usr, we should use /etc for configuration. Using /usr/etc does not make sense. REVIEW: 120246 --- kde-modules/KDEInstallDirs.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'kde-modules') diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index e255e87e..46d3a5c6 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -114,7 +114,9 @@ # D-Bus system services (``DBUSDIR/system-services``) # [``DBUS_SYSTEM_SERVICES_INSTALL_DIR``] # ``SYSCONFDIR`` -# read-only single-machine data (``etc``) [``SYSCONF_INSTALL_DIR``] +# read-only single-machine data +# (``etc``, or ``/etc`` if ``CMAKE_INSTALL_DIR`` is ``/usr``) +# [``SYSCONF_INSTALL_DIR``] # ``CONFDIR`` # application configuration files (``SYSCONFDIR/xdg``) # [``CONFIG_INSTALL_DIR``] @@ -458,9 +460,13 @@ _define_relative(DBUSSYSTEMSERVICEDIR DBUSDIR "system-services" +set(_default_sysconf_dir "etc") +if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") + set(_default_sysconf_dir "/etc") +endif() -_define_absolute(SYSCONFDIR "etc" +_define_absolute(SYSCONFDIR "${_default_sysconf_dir}" "read-only single-machine data" SYSCONF_INSTALL_DIR) _define_relative(CONFDIR SYSCONFDIR "xdg" -- cgit v1.2.1