From 1c77a74d74f9a05a5b722d1df329a8a5d9ac1e96 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Fri, 25 Mar 2011 19:36:36 -0400
Subject: [PATCH] Fix generation of cairo typelib

By separating out cairo-1.0.gir from gir_DATA, we lost the generation
of the cairo typelib. So instead add cairo-1.0.gir to a new
SUBSTITUTED_GIRSOURCES and include that in gir_DATA.

Fix the rule for generating cairo-1.0.gir for srcdir != builddir.

https://bugzilla.gnome.org/show_bug.cgi?id=645692
---
 Makefile-gir.am | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile-gir.am b/Makefile-gir.am
index da53a2a..2d23749 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -1,4 +1,5 @@
 BUILT_GIRSOURCES =
+SUBSTITUTED_GIRSOURCES =
 
 STATIC_GIRSOURCES =               \
         gir/DBus-1.0.gir           \
@@ -13,14 +14,14 @@ STATIC_GIRSOURCES =               \
         gir/xrandr-1.3.gir
 EXTRA_DIST += $(STATIC_GIRSOURCES)
 
-cairogirdir=$(GIR_DIR)
-cairogir_DATA = gir/cairo-1.0.gir
 gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile
+	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed \
 	-e s,%CAIRO_SHARED_LIBRARY%,$(CAIRO_SHARED_LIBRARY), \
 	-e s,%CAIRO_GIR_PACKAGE%,$(CAIRO_GIR_PACKAGE), \
 	< $< > $@.tmp && mv $@.tmp $@
 BUILT_SOURCES += gir/cairo-1.0.gir
+SUBSTITUTED_GIRSOURCES += gir/cairo-1.0.gir
 CLEANFILES += gir/cairo-1.0.gir
 EXTRA_DIST += gir/cairo-1.0.gir.in
 
@@ -224,7 +225,7 @@ CLEANFILES += $(BUILT_GIRSOURCES)
 INTROSPECTION_GIRS += $(BUILT_GIRSOURCES)
 
 girdir = $(GIR_DIR)
-gir_DATA = $(STATIC_GIRSOURCES) $(BUILT_GIRSOURCES)
+gir_DATA = $(STATIC_GIRSOURCES) $(SUBSTITUTED_GIRSOURCES) $(BUILT_GIRSOURCES)
 
 typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(gir_DATA:.gir=.typelib)
-- 
2.7.4