diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-12 13:41:19 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 15:53:16 +0000 |
| commit | 17770462527c13882b045422aacf474ecf2bf310 (patch) | |
| tree | 028801791dc1681a42844cf1322dcef2d7702357 /plugins | |
| parent | 69ceb2ac6e10914ca21ffbeff94c98b13db72117 (diff) | |
Be parallel-installable with Gabble 0.x
... apart from /usr/share/doc, which packagers will probably
shuffle around according to distro policy anyway.
Also use telepathy-glib-1 and telepathy-glib-1-dbus in the .pc files.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49737
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Makefile.am | 4 | ||||
| -rwxr-xr-x | plugins/telepathy-gabble-1-xmpp-console (renamed from plugins/telepathy-gabble-xmpp-console) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 2b0007901..536f49de9 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -30,14 +30,14 @@ if ENABLE_PLUGINS pluginexec_LTLIBRARIES = $(installable_plugins) dist_bin_SCRIPTS = \ - telepathy-gabble-xmpp-console + telepathy-gabble-1-xmpp-console else # we still compile the plugin (just to make sure it compiles!) but we don't # install it noinst_LTLIBRARIES += $(installable_plugins) EXTRA_DIST = \ - telepathy-gabble-xmpp-console + telepathy-gabble-1-xmpp-console endif AM_LDFLAGS = -avoid-version -shared -no-undefined diff --git a/plugins/telepathy-gabble-xmpp-console b/plugins/telepathy-gabble-1-xmpp-console index ea5831563..ea5831563 100755 --- a/plugins/telepathy-gabble-xmpp-console +++ b/plugins/telepathy-gabble-1-xmpp-console |