Index: gnome-bluetooth-2.29.3/lib/Makefile.am
===================================================================
--- gnome-bluetooth-2.29.3.orig/lib/Makefile.am
+++ gnome-bluetooth-2.29.3/lib/Makefile.am
@@ -82,12 +82,12 @@ GnomeBluetooth-1.0.gir: $(INTROSPECTION_
 		$(LIBGNOMEBT_CFLAGS) \
 		$(gnomebluetooth_HEADERS)
 
-girdir = $(GIRDIR)
+girdir = $(INTROSPECTION_GIRDIR)
 dist_gir_DATA = $(BUILT_GIRSOURCES)
 
 EXTRA_DIST += $(BUILT_GIRSOURCES)
 
-typelibsdir = $(TYPELIBDIR)
+typelibsdir = $(INTROSPECTION_TYPELIBDIR)
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(G_IR_COMPILER)
Index: gnome-bluetooth-2.29.3/lib/Makefile.in
===================================================================
--- gnome-bluetooth-2.29.3.orig/lib/Makefile.in
+++ gnome-bluetooth-2.29.3/lib/Makefile.in
@@ -433,9 +433,9 @@ gnomebluetooth_HEADERS = \
 	bluetooth-plugin.h
 
 AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\"
-@HAVE_INTROSPECTION_TRUE@girdir = $(GIRDIR)
+@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR)
 @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(BUILT_GIRSOURCES)
-@HAVE_INTROSPECTION_TRUE@typelibsdir = $(TYPELIBDIR)
+@HAVE_INTROSPECTION_TRUE@typelibsdir = $(INTROSPECTION_TYPELIBDIR)
 @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 BUILT_SOURCES = marshal.h marshal.c \
 		bluetooth-client-glue.h \