Index: src/lib/core/Makefile.am
===================================================================
--- src/lib/core/Makefile.am.orig
+++ src/lib/core/Makefile.am
@@ -112,10 +112,10 @@ BuzztardCore-0.0.gir: $(G_IR_SCANNER) li
 	     $(gir_sources) || touch $@
 BUILT_GIRSOURCES = BuzztardCore-0.0.gir
 
-girdir = $(datadir)/gir
+girdir = $(GIRDIR)
 dist_gir_DATA = $(BUILT_GIRSOURCES)
 
-typelibsdir = $(libdir)/girepository
+typelibsdir = $(TYPELIBDIR)
 typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
 
 TXML = $(dist_gir_DATA:.gir=.gir.txml)
Index: src/lib/ic/Makefile.am
===================================================================
--- src/lib/ic/Makefile.am.orig
+++ src/lib/ic/Makefile.am
@@ -83,10 +83,10 @@ BuzztardIc-0.0.gir: $(G_IR_SCANNER) libb
 	     $(gir_sources) || touch $@
 BUILT_GIRSOURCES = BuzztardIc-0.0.gir
 
-girdir = $(datadir)/gir
+girdir = $(GIRDIR)
 dist_gir_DATA = $(BUILT_GIRSOURCES)
 
-typelibsdir = $(libdir)/girepository
+typelibsdir = $(TYPELIBDIR)
 typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
 
 TXML = $(dist_gir_DATA:.gir=.gir.txml)
Index: src/lib/core/Makefile.in
===================================================================
--- src/lib/core/Makefile.in.orig
+++ src/lib/core/Makefile.in
@@ -508,9 +508,9 @@ pkgconfig_DATA = libbuzztard-core.pc
 @USE_GIR_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libbuzztard_core_la_SOURCES))
 @USE_GIR_FALSE@BUILT_GIRSOURCES = 
 @USE_GIR_TRUE@BUILT_GIRSOURCES = BuzztardCore-0.0.gir
-@USE_GIR_TRUE@girdir = $(datadir)/gir
+@USE_GIR_TRUE@girdir = $(GIRDIR)
 @USE_GIR_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES)
-@USE_GIR_TRUE@typelibsdir = $(libdir)/girepository
+@USE_GIR_TRUE@typelibsdir = $(TYPELIBDIR)
 @USE_GIR_TRUE@typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
 @USE_GIR_TRUE@TXML = $(dist_gir_DATA:.gir=.gir.txml)
 EXTRA_DIST = \
Index: src/lib/ic/Makefile.in
===================================================================
--- src/lib/ic/Makefile.in.orig
+++ src/lib/ic/Makefile.in
@@ -455,9 +455,9 @@ pkgconfig_DATA = libbuzztard-ic.pc
 @USE_GIR_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libbuzztard_ic_la_SOURCES))
 @USE_GIR_FALSE@BUILT_GIRSOURCES = 
 @USE_GIR_TRUE@BUILT_GIRSOURCES = BuzztardIc-0.0.gir
-@USE_GIR_TRUE@girdir = $(datadir)/gir
+@USE_GIR_TRUE@girdir = $(GIRDIR)
 @USE_GIR_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES)
-@USE_GIR_TRUE@typelibsdir = $(libdir)/girepository
+@USE_GIR_TRUE@typelibsdir = $(TYPELIBDIR)
 @USE_GIR_TRUE@typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
 @USE_GIR_TRUE@TXML = $(dist_gir_DATA:.gir=.gir.txml)
 EXTRA_DIST = \