From f5f76dfd7441f5286a434a78133da263cf8d54ec Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 12 Mar 2013 14:26:30 -0500
Subject: build: fix Vala bindings build and distcheck

Didn't handle srcdir != builddir and got installed without PREFIX.
---
 vapi/Makefile.am | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'vapi')

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index f90a9f7dd4..e154554893 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -4,6 +4,8 @@ EXTRA_DIST = \
 	libnm-util.deps \
 	libnm-glib.deps
 
+VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
+
 if ENABLE_VAPIGEN
 include Makefile.vapigen
 
@@ -16,13 +18,13 @@ libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
 
 libnm_glib_vapi_METADATADIRS = $(srcdir)
 libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
-libnm_glib_vapi_VAPIDIRS = $(srcdir)
+libnm_glib_vapi_VAPIDIRS = $(builddir)
 libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
+libnm_glib_vapi_DEPS = gio-2.0
 
-VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
-
-vapidir = $(VAPIGEN_VAPIDIR)
+vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
-
 endif
+
+CLEANFILES = $(VAPIGEN_VAPIS)
-- 
cgit v1.2.1