From fa0d57dd47bc6e635e1776085281dc8c3e960642 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 10 Mar 2016 07:14:44 +1000
Subject: [PATCH] Install the dbus config as well

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Makefile.am  | 14 ++++++++++----
 configure.ac |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 89307737..c9431370 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,13 +86,19 @@ unit_DATA = ratbagd.service
 $(unit_DATA): $(unit_DATA).in
 	$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
 
-dbusdir = $(DBUS_SYSTEM_SERVICES_DIR)
-dbus_DATA = dbus/org.freedesktop.ratbag1.service
+dbusservicedir = $(DBUS_SYSTEM_SERVICES_DIR)
+dbusservice_DATA = dbus/org.freedesktop.ratbag1.service
 
-$(dbus_DATA): $(dbus_DATA).in
+$(dbusservice_DATA): $(dbusservice_DATA).in
 	$(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@
 
-EXTRA_DIST += ratbagd.service.in dbus/org.freedesktop.ratbag1.service.in
+dbusconfigdir = $(DBUS_SYSTEM_CONFIG_DIR)
+dbusconfig_DATA = dbus/org.freedesktop.ratbag1.conf
+
+EXTRA_DIST += \
+	      ratbagd.service.in \
+	      dbus/org.freedesktop.ratbag1.service.in \
+	      dbus/org.freedesktop.ratbag1.conf
 BUILT_SOURCES += ratbagd.service dbus/org.freedesktop.ratbag1.service
 
 # ------------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 08ff8e16..16a86eea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ AC_ARG_WITH([dbus-root-dir],
 	    [unitdir="$withval"],
 	    [unitdir="$datadir/dbus-1"])
 DBUS_SYSTEM_SERVICES_DIR="${datadir}/system-services"
+DBUS_SYSTEM_CONFIG_DIR="${datadir}/system.d"
 AC_SUBST(DBUS_SYSTEM_SERVICES_DIR)
 
 # ------------------------------------------------------------------------------