diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-10-02 16:24:21 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-10-05 16:29:46 +0100 |
| commit | 676d9c9d129fae6a9a9b29a7f8a606df3d33a3e6 (patch) | |
| tree | 3d9d3ca96513e689d011569598c2e6531e17b56a /cmake | |
| parent | 9b8f844e10eae8d50c32ce800d8ce6735195162e (diff) | |
cmake: simplify definition of installation paths
In particular, changing the meaning of DBUS_DATADIR part
way through the file is really confusing.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83539
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 4db9c67a..4bde2792 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -61,23 +61,6 @@ else (DBUS_INSTALL_DIR) set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") endif (DBUS_INSTALL_DIR) -# autotools style -if (NOT DATAROOTDIR) - set (DATAROOTDIR share) -endif() - -if (NOT DATADIR) - set (DATADIR ${DATAROOTDIR}) -endif() - -if (NOT DOCDIR) - SET(DOCDIR ${DATAROOTDIR}/doc/dbus) -endif() - -if (NOT DBUS_DATADIR) - SET(DBUS_DATADIR ${DATADIR}) -endif() - set(DBUS_PREFIX ${DBUS_INSTALL_DIR}) set(prefix ${DBUS_INSTALL_DIR}) @@ -87,7 +70,7 @@ set(EXPANDED_INCLUDEDIR ${DBUS_INSTALL_DIR}/include) set(EXPANDED_BINDIR ${DBUS_INSTALL_DIR}/bin) set(EXPANDED_SYSCONFDIR ${DBUS_INSTALL_DIR}/etc) set(EXPANDED_LOCALSTATEDIR ${DBUS_INSTALL_DIR}/var) -set(EXPANDED_DATADIR ${DBUS_INSTALL_DIR}/${DBUS_DATADIR}) +set(EXPANDED_DATADIR ${DBUS_INSTALL_DIR}/share) set(DBUS_MACHINE_UUID_FILE ${DBUS_INSTALL_DIR}/lib/dbus/machine-id) set(DBUS_BINDIR ${EXPANDED_BINDIR}) set(DBUS_DAEMONDIR ${EXPANDED_BINDIR}) @@ -106,6 +89,7 @@ set(SYSCONFDIR_FROM_PKGDATADIR ${EXPANDED_SYSCONFDIR}) set(DATADIR_FROM_PKGSYSCONFDIR ${EXPANDED_DATADIR}) endif() +# used in the C code set(DBUS_LIBEXECDIR ${EXPANDED_LIBDIR}) set(DBUS_DATADIR ${EXPANDED_DATADIR}) |