[telepathy-gabble/master] Put headers in lib/telepathy-gabble-0/{gabble, wocky}

[Will Thompson]

This isn't part of 'telepathy-1.0', and putting the two directories
side-by-side (rather than wocky/ being inside gabble/)means that
including <plugin.h> won't accidentally include gabble/plugin.h because
gabble/ was in the include path for Wocky's benefit.
---
 gabble/Makefile.am            |    6 +++---
 gabble/plugin.h               |    2 +-
 gabble/telepathy-gabble.pc.in |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gabble/Makefile.am b/gabble/Makefile.am
index a08e2fd..a4a2b79 100644
--- a/gabble/Makefile.am
+++ b/gabble/Makefile.am
@@ -2,14 +2,14 @@ if ENABLE_PLUGINS
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = telepathy-gabble.pc
 
-gabbleincludedir = $(includedir)/telepathy-1.0/gabble
+gabbleincludedir = $(includedir)/telepathy-gabble-0/gabble
 gabbleinclude_HEADERS = \
     plugin.h \
     sidecar.h
 
-# We install these headers under gabble's so that an actual separate Wocky
+# We install these headers alongside gabble's so that an actual separate Wocky
 # installation won't clash with them.
-wockyincludedir = $(gabbleincludedir)/wocky
+wockyincludedir = $(includedir)/telepathy-gabble-0/wocky
 wockyinclude_HEADERS = \
     $(top_srcdir)/lib/ext/wocky/wocky/wocky-types.h                  \
     $(top_srcdir)/lib/ext/wocky/wocky/wocky.h                        \
diff --git a/gabble/plugin.h b/gabble/plugin.h
index e5b2054..cdeb5b0 100644
--- a/gabble/plugin.h
+++ b/gabble/plugin.h
@@ -26,7 +26,7 @@
 #include <telepathy-glib/base-connection.h>
 #include <wocky/wocky-session.h>
 
-#include "sidecar.h"
+#include <gabble/sidecar.h>
 
 #define GABBLE_TYPE_PLUGIN (gabble_plugin_get_type ())
 #define GABBLE_PLUGIN(obj) \
diff --git a/gabble/telepathy-gabble.pc.in b/gabble/telepathy-gabble.pc.in
index 808b64e..c01a900 100644
--- a/gabble/telepathy-gabble.pc.in
+++ b/gabble/telepathy-gabble.pc.in
@@ -10,4 +10,4 @@ Description: XMPP backend for the Telepathy framework
 Version: @VERSION@
 Requires: pkg-config >= 0.21
 Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gio-2.0, telepathy-glib >= 0.7.37
-Cflags: -I${includedir}/telepathy-1.0 -I${includedir}/telepathy-1.0/gabble
+Cflags: -I${includedir}/telepathy-gabble-0
-- 
1.5.6.5