[telepathy-glib/master] tests/dbus/Makefile.am: support out-of-tree builds, and distribute dbus-1/session.conf.in

[Simon McVittie]

---
 tests/dbus/Makefile.am |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 73a0a02..0ecc9a4 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -199,14 +199,16 @@ distclean-local:
 	rm -rf _gen
 
 EXTRA_DIST = \
+    dbus-1/session.conf.in \
     dbus-1/services/spurious.service \
     telepathy/managers/spurious.manager \
     telepathy/managers/test_manager_file.manager \
     telepathy/managers/test_manager_file_invalid.manager \
     with-properties.xml
 
-dbus-1/%.conf: dbus-1/%.conf.in
-	sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+dbus-1/%.conf: $(srcdir)/dbus-1/%.conf.in
+	$(AM_V_at)$(mkdir_p) dbus-1
+	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
 
 _gen/svc.c _gen/svc.h: with-properties.xml \
 	$(top_srcdir)/tools/glib-ginterface-gen.py \
-- 
1.5.6.5