From ca107ebb16fced347dba4194181b05132fdcba59 Mon Sep 17 00:00:00 2001 From: Ikey Doherty Date: Wed, 18 Jan 2017 22:25:46 +0000 Subject: [PATCH] system-helper: Allow configuration of dbus configuration directory Newer versions of dbus support stateless directories, and many distributions now use /usr/share/dbus-1/system.d for the vendor configuration files, as opposed to the legacy /etc/dbus-1/system.d directory. To enable this, we add a new --with-dbus-config-dir option to control the configuration directory, whilst retaining backwards compatibility for those still using older versions of dbus. Signed-off-by: Ikey Doherty --- configure.ac | 6 ++++++ system-helper/Makefile.am.inc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index eb346c3b..b9a5f72a 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,12 @@ AC_ARG_WITH(dbus_service_dir, DBUS_SERVICE_DIR=$with_dbus_service_dir AC_SUBST(DBUS_SERVICE_DIR) +AC_ARG_WITH(dbus_config_dir, + AS_HELP_STRING([--with-dbus-config-dir=PATH],[choose directory for dbus config files, [default=SYSCONFDIR/dbus-1/system.d]]), + with_dbus_config_dir="$withval", with_dbus_config_dir=${sysconfdir}/dbus-1/system.d) +DBUS_CONFIG_DIR=$with_dbus_config_dir +AC_SUBST(DBUS_CONFIG_DIR) + AC_ARG_WITH([systemduserunitdir], [AS_HELP_STRING([--with-systemduserunitdir=DIR], [Directory for systemd user service files (default=PREFIX/lib/systemd/user)])], diff --git a/system-helper/Makefile.am.inc b/system-helper/Makefile.am.inc index e8a04f3e..3e0248e5 100644 --- a/system-helper/Makefile.am.inc +++ b/system-helper/Makefile.am.inc @@ -8,7 +8,7 @@ dbussystemservicedir = $(datadir)/dbus-1/system-services service_in_files += system-helper/org.freedesktop.Flatpak.SystemHelper.service.in dbussystemservice_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.service -dbusconfdir = ${sysconfdir}/dbus-1/system.d +dbusconfdir = $(DBUS_CONFIG_DIR) dbusconf_DATA = system-helper/org.freedesktop.Flatpak.SystemHelper.conf service_in_files += system-helper/flatpak-system-helper.service.in