diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
| commit | b81df5f0da5a86fe5bef05f3d8d627f6a01cee76 (patch) | |
| tree | 540d8894da5b5d4f3a0513b68af1b59ec584f530 /tests/twisted/tools/Makefile.am | |
| parent | d8edca5135d6b9fdbec6d25441f61e1f01098f28 (diff) | |
| download | telepathy-salut-b81df5f0da5a86fe5bef05f3d8d627f6a01cee76.tar.gz | |
Revert to commit 822ddd0
Some commits intended for 'next' appear to have ended up on master.
Diffstat (limited to 'tests/twisted/tools/Makefile.am')
| -rw-r--r-- | tests/twisted/tools/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am index bab9999f..aaca6af3 100644 --- a/tests/twisted/tools/Makefile.am +++ b/tests/twisted/tools/Makefile.am @@ -8,12 +8,12 @@ exec-with-log.sh: exec-with-log.sh.in # 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.telepathy1.ConnectionManager.%.service: %.service.in +org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ # D-Bus service file for testing service_in_files = salut.service.in -service_files = im.telepathy1.ConnectionManager.salut.service +service_files = org.freedesktop.Telepathy.ConnectionManager.salut.service # D-Bus config file for testing conf_in_files = tmp-session-bus.conf.in |