diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2020-04-23 18:41:03 +0200 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2020-06-10 18:13:47 +0000 |
| commit | 3f3368b4902d8b0dd3c85eb9628d55424ab42cfb (patch) | |
| tree | fad7d2db58bfc2f90ddf18919673ab7128576868 /bus | |
| parent | d5fd3d76f794b9bfdebb57345f79a796885e79f1 (diff) | |
| download | dbus-3f3368b4902d8b0dd3c85eb9628d55424ab42cfb.tar.gz | |
cmake: Use CMAKE_INSTALL_FULL_<dir> for configuration and state
This means we apply GNUInstallDirs' various special cases when
the prefix is /, /usr or something starting with /opt; these are
not applied when installing to CMAKE_INSTALL_<dir>. See
https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html#special-cases
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bus/CMakeLists.txt b/bus/CMakeLists.txt index f56bbb85..5d76573d 100644 --- a/bus/CMakeLists.txt +++ b/bus/CMakeLists.txt @@ -107,16 +107,16 @@ set_target_properties(dbus-daemon PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIEN install(TARGETS dbus-daemon ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/session.d) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services) if(NOT WIN32) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/system.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/dbus-1) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d) install(DIRECTORY DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services) - install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/run/dbus) + install(DIRECTORY DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/dbus) endif() if(DBUS_SERVICE) |