build: fix Vala bindings build and distcheck

Didn't handle srcdir != builddir and got installed without PREFIX.
This commit is contained in:
Dan Williams
2013-03-12 14:26:30 -05:00
parent c7df1ad224
commit f5f76dfd74

View File

@@ -4,6 +4,8 @@ EXTRA_DIST = \
libnm-util.deps \ libnm-util.deps \
libnm-glib.deps libnm-glib.deps
VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
if ENABLE_VAPIGEN if ENABLE_VAPIGEN
include Makefile.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_METADATADIRS = $(srcdir)
libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir 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_GIRDIRS = $(top_builddir)/libnm-util
libnm_glib_vapi_DEPS = gio-2.0
VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi vapidir = $(datadir)/vala/vapi
vapidir = $(VAPIGEN_VAPIDIR)
vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
endif endif
CLEANFILES = $(VAPIGEN_VAPIS)