diff options
| author | Mike Gorse <mgorse@suse.com> | 2014-10-08 21:10:43 -0500 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2014-10-08 21:10:43 -0500 |
| commit | 6ad476a7c35540023e5272afdb2b5db83b6f4067 (patch) | |
| tree | b3f727871a7aa02a7795c82abd397fb17c556291 | |
| parent | 5ef30626a68a0c42cf36f414e3baf43de06e2a8d (diff) | |
| download | at-spi2-core-6ad476a7c35540023e5272afdb2b5db83b6f4067.tar.gz | |
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
| -rw-r--r-- | bus/Makefile.am | 10 | ||||
| -rw-r--r-- | bus/accessibility.conf.in (renamed from bus/accessibility.conf) | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index c65de948..b9bcd00a 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 index a5c770e3..31b6a792 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> |