--- Makefile.in.orig	Thu May  3 15:19:30 2007
+++ Makefile.in	Thu May  3 15:19:44 2007
@@ -248,7 +248,7 @@ target_alias = @target_alias@
 
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
 
 bin_SCRIPTS = glib-gettextize
 
@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
 	config.h.win32		\
 	gtk-doc.make
 
-
-configexecincludedir = $(libdir)/glib-2.0/include
+glibincludedir = $(includedir)/glib-2.0
+configexecincludedir = $(glibincludedir)
 
 CONFIGURE_DEPENDENCIES = acglib.m4