[next] telepathy-glib: vala: Fix srcdir != builddir

Simon McVittie smcv at kemper.freedesktop.org
Fri May 11 09:20:20 PDT 2012


Module: telepathy-glib
Branch: next
Commit: fc6d558a71bfbe97362aade4a0fe8598b0ad067e
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=fc6d558a71bfbe97362aade4a0fe8598b0ad067e

Author: Colin Walters <walters at verbum.org>
Date:   Fri May 11 15:53:51 2012 +0100

vala: Fix srcdir != builddir

We need to look for the .metadata file in the source directory,
otherwise we silently generate a binding with a namespace of "Tp", not
"TelepathyGLib".

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49802
Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>

---

 vala/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/vala/Makefile.am b/vala/Makefile.am
index faefefa..8076076 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -15,6 +15,7 @@ pkgconfigdir = ${libdir}/pkgconfig
 telepathy-glib.vapi: $(top_builddir)/telepathy-glib/TelepathyGLib-0.12.gir
 	$(VAPIGEN_V)$(VAPIGEN) \
 		--library telepathy-glib \
+		--metadatadir=$(top_srcdir)/telepathy-glib \
 		--pkg gio-2.0 \
 		$< \
 		$(NULL)



More information about the telepathy-commits mailing list