-do_subst = sed -e 's,[@]prefix[@],${prefix},g' \
- -e 's,[@]sysconfdir[@],${sysconfdir},g' \
- -e 's,[@]DBUS_DAEMON[@],@DBUS_DAEMON@,g'
+substitutions = "s,@libexecdir[@],$(libexecdir),"
+at-spi-dbus-bus.desktop: at-spi-dbus-bus.desktop.in
+ sed -e$ $(substitutions) $< > $@.tmp && mv $@.tmp $@
+EXTRA_DIST = at-spi-dbus-bus.desktop.in
+CLEANFILES += at-spi-dbus-bus.desktop
+
+dbusservicedir=$(DBUS_SERVICES_DIR)
+dbusservice_DATA = org.a11y.Bus.service
+
+org.a11y.Bus.service: org.a11y.Bus.service.in
+ sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
+
+accessibility.conf: accessibility.conf.in
+ sed -e "s|[@]DATADIR[@]|$(datadir)|" $(srcdir)/$@.in > $@