libnm-glib: specify --girdir to vapigen (bgo #678743)

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 67a3180..faa9eac 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -17,6 +17,7 @@ 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_GIRDIRS = $(top_builddir)/libnm-util
 
 VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
 

diff --git a/vapi/Makefile.vapigen b/vapi/Makefile.vapigen
index 30e515b..feb5633 100644 (file)
--- a/vapi/Makefile.vapigen
+++ b/vapi/Makefile.vapigen
@@ -53,6 +53,7 @@ $(1): $$($(_vapi_name)_GIR)
          --library $(1:.vapi=) \
          $(foreach _vapi_metadatadir_name,$(if $($(_vapi_name)_METADATADIRS),$($(_vapi_name)_METADATADIRS),$(VAPIGEN_METADATADIRS)),--metadatadir $(_vapi_metadatadir_name)) \
          $(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
+         $(foreach _vapi_gir_dir,$(if $($(_vapi_name)_GIRDIRS),$($(_vapi_name)_GIRDIRS),$(VAPIGEN_GIRDIRS)),--girdir $(_vapi_gir_dir)) \
          $(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \
          $$($(_vapi_name)_FILES)
 endef