[gnome-builder/gnome-builder-3-18] build: add builddir to GIRDIRS and don't ship .gir

[Christian Hergert <chergert src gnome org>]

commit 0fefc34e670f0b7c7cdc14d673fd6f95dc70480d
Author: Christian Hergert <chergert redhat com>
Date:   Tue Oct 13 11:57:10 2015 -0700

    build: add builddir to GIRDIRS and don't ship .gir
    
    .gir are potentially platform dependent. So make sure that we just
    generate them on the host platform rather than shipping them in the
    tarball.

 libide/Makefile.am |    4 ++--
 src/Makefile.am    |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index a49bf21..ebb8b71 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -386,12 +386,12 @@ Ide_1_0_gir_SCANNERFLAGS = \
 INTROSPECTION_GIRS += Ide-1.0.gir
 
 girdir = $(datadir)/gnome-builder/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+gir_DATA = $(INTROSPECTION_GIRS)
 
 typelibdir = $(pkglibdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 94bc134..264712d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -320,12 +320,12 @@ Builder_1_0_gir_SCANNERFLAGS = \
 INTROSPECTION_GIRS += Builder-1.0.gir
 
 girdir = $(datadir)/gnome-builder/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
+gir_DATA = $(INTROSPECTION_GIRS)
 
 typelibdir = $(pkglibdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
 
@@ -340,7 +340,7 @@ gnome_builder_1_0_vapi_DEPS = libide-1.0 gio-2.0 gtk+-3.0 gtksourceview-3.0
 gnome_builder_1_0_vapi_VAPIDIRS = $(top_builddir)/libide
 gnome_builder_1_0_vapi_METADATADIRS = $(srcdir)
 gnome_builder_1_0_vapi_FILES = Builder-1.0.gir
-gnome_builder_1_0_vapi_GIRDIRS = $(top_srcdir)/libide
+gnome_builder_1_0_vapi_GIRDIRS = $(top_builddir)/libide
 
 gnome-builder-1.0.deps: Makefile
        $(AM_V_GEN) echo $(gnome_builder_1_0_vapi_DEPS) | tr ' ' '\n' > $@