diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-11-07 15:07:31 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-11-07 15:07:31 +0000 |
| commit | e92da3387bdca560074656b65e3367f9c4086d4c (patch) | |
| tree | 8096be71e8dbed51221b32ed59ccf598ba883e28 /kde-modules | |
| parent | 32c41706e06e96ab10b757ebe6337071db53fe43 (diff) | |
| download | extra-cmake-modules-e92da3387bdca560074656b65e3367f9c4086d4c.tar.gz extra-cmake-modules-e92da3387bdca560074656b65e3367f9c4086d4c.tar.bz2 | |
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
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
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" |