diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-08 10:36:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-08 10:36:49 +0100 |
| commit | a3cb554fd61cd91aec453052356570602e802475 (patch) | |
| tree | ba002d3ff2e4a5598dafcbddcc5c7b13c5824a7d /server | |
| parent | af504f1f7db73c71e35f3c3701bfe9e428d02b72 (diff) | |
| parent | 09c0b67148873c65d36afd322712a8a6db7eb7a5 (diff) | |
Merge branch 'telepathy-mission-control-5.12'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 5 | ||||
| -rw-r--r-- | server/org.freedesktop.Telepathy.MissionControl5.service.in | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 76cd0030..5be1cdc1 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -22,7 +22,10 @@ servicefile_DATA=org.freedesktop.Telepathy.MissionControl5.service \ org.freedesktop.Telepathy.AccountManager.service %.service: %.service.in Makefile - $(AM_V_GEN)sed -e 's![@]libexecdir[@]!$(libexecdir)!' $< > $@ + $(AM_V_GEN)sed \ + -e 's![@]libexecdir[@]!$(libexecdir)!' \ + -e 's![@]bindir[@]!$(bindir)!' \ + $< > $@ man8_MANS = mission-control-5.8 diff --git a/server/org.freedesktop.Telepathy.MissionControl5.service.in b/server/org.freedesktop.Telepathy.MissionControl5.service.in index d91d4dd8..51f4dc17 100644 --- a/server/org.freedesktop.Telepathy.MissionControl5.service.in +++ b/server/org.freedesktop.Telepathy.MissionControl5.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.MissionControl5 -Exec=@libexecdir@/mission-control-5 +Exec=@bindir@/mc-wait-for-name --activate org.freedesktop.Telepathy.AccountManager org.freedesktop.Telepathy.MissionControl5 |