[next] telepathy-salut: Fix mock-avahi paths

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: 6456b84a6452e528f0f8eb8878f7ef9713f2500b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=6456b84a6452e528f0f8eb8878f7ef9713f2500b

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May 12 11:25:17 2014 +0100

Fix mock-avahi paths

---

 tests/twisted/tools/Makefile.am |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index c07f5c7..206b993 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -15,16 +15,17 @@ installed/%.conf: %.conf.in Makefile
 # temporary session bus's address
 mock-avahi/%.conf: %.conf.in Makefile
 	@$(MKDIR_P) mock-avahi
-	$(AM_V_GEN)sed -e "s|^Exec=.*|Exec=/bin/sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$$DBUS_SESSION_BUS_ADDRESS ${libexecdir}/telepathy-salut-1'|g" $< > $@
+	$(AM_V_GEN)sed -e 's|[@]servicedir[@]|${twistedtoolsdir}/mock-avahi|g' $< > $@
 
 # We don't use the full filename for the .in because > 99 character filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
 # non-archaic tarballs)
-im.telepathy.v1.ConnectionManager.%.service: %.service.in
+im.telepathy.v1.ConnectionManager.%.service: %.service.in Makefile
 	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
 
-mock-avahi/im.telepathy.v1.ConnectionManager.%.service: %.service.in
-	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+mock-avahi/im.telepathy.v1.ConnectionManager.%.service: %.service.in Makefile
+	@$(MKDIR_P) mock-avahi
+	$(AM_V_GEN)sed -e "s|Exec=.*|Exec=/bin/sh -c 'DBUS_SYSTEM_BUS_ADDRESS=\$$DBUS_SESSION_BUS_ADDRESS ${libexecdir}/telepathy-salut-1'|g" $< > $@
 
 # D-Bus service file for testing
 service_in_files = salut.service.in