[at-spi2-core] Set servicedir in accessibility.conf

[Mike Gorse <mgorse src gnome org>]

commit 6ad476a7c35540023e5272afdb2b5db83b6f4067
Author: Mike Gorse <mgorse suse com>
Date:   Wed Oct 8 21:10:43 2014 -0500

    Set servicedir in accessibility.conf
    
    We need to let the accessibility bus know where to find its
    service file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=722738

 bus/Makefile.am                                   |   10 ++++++++--
 bus/{accessibility.conf => accessibility.conf.in} |    1 +
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/bus/Makefile.am b/bus/Makefile.am
index c65de94..b9bcd00 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -25,8 +25,14 @@ dbusservice_DATA = org.a11y.Bus.service
 
 org.a11y.Bus.service: org.a11y.Bus.service.in
        sed -e $(substitutions) $< > $  tmp && mv $  tmp $@
-EXTRA_DIST += org.a11y.Bus.service.in
-CLEANFILES += org.a11y.Bus.service
 
+accessibility.conf: accessibility.conf.in
+       sed -e "s|[ ]DATADIR[@]|$(datadir)|" $(srcdir)/$  in > $@
+
+EXTRA_DIST += org.a11y.Bus.service.in \
+       accessibility.conf.in
+
+DISTCLEANFILES = org.a11y.Bus.service \
+       accessibility.conf
 
 -include $(top_srcdir)/git.mk
diff --git a/bus/accessibility.conf b/bus/accessibility.conf.in
similarity index 95%
rename from bus/accessibility.conf
rename to bus/accessibility.conf.in
index a5c770e..31b6a79 100644
--- a/bus/accessibility.conf
+++ b/bus/accessibility.conf.in
@@ -3,6 +3,7 @@
 
   <type>accessibility</type>
 
+<servicedir>@DATADIR@/dbus-1/accessibility-services</servicedir>
   <auth>EXTERNAL</auth>
 
   <listen>unix:tmpdir=/tmp</listen>