diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2021-04-28 15:44:05 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2021-04-30 17:00:50 +0200 |
| commit | 299a6af3eedb928b50d7ad8edb311726d0ab3bbf (patch) | |
| tree | 63e860ca28852ea3ab819c701d9437e871dc77fc | |
| parent | d65b67e381aa527712f5d5c0840ac2f59e749e2e (diff) | |
| download | NetworkManager-299a6af3eedb928b50d7ad8edb311726d0ab3bbf.tar.gz | |
build: install D-Bus service files to /usr by default
Service files shipped by distribution should be in /usr.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dbe3bc8ea3..abc283c83d 100644 --- a/configure.ac +++ b/configure.ac @@ -727,7 +727,7 @@ AC_ARG_WITH(dbus-sys-dir, if test -n "$with_dbus_sys_dir" ; then DBUS_SYS_DIR="$with_dbus_sys_dir" else - DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d" + DBUS_SYS_DIR="${datadir}/dbus-1/system.d" fi AC_SUBST(DBUS_SYS_DIR) diff --git a/meson.build b/meson.build index f1c5f082e2..24e50ddef4 100644 --- a/meson.build +++ b/meson.build @@ -552,7 +552,7 @@ endif dbus_conf_dir = get_option('dbus_conf_dir') if dbus_conf_dir == '' assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus config dir') - dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', nm_sysconfdir]), 'dbus-1', 'system.d') + dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'system.d') endif dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', nm_datadir]) |