diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-05-12 11:25:17 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-05-12 11:25:17 +0100 |
| commit | 6456b84a6452e528f0f8eb8878f7ef9713f2500b (patch) | |
| tree | 0406ebca5b8fc5a79f1edf67a7e73cda75e741be | |
| parent | 8a1da0520d38acd65a2cbfc78a2a4f72a4e31e00 (diff) | |
Fix mock-avahi paths
| -rw-r--r-- | tests/twisted/tools/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am index c07f5c70..206b993c 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 |