[msitools] libmsi: fix out-of-tree build

[Paolo Bonzini <pbonzini src gnome org>]

commit 560bf62368f3bbc71f43b3e94cd2150877aa6c44
Author: Paolo Bonzini <pbonzini redhat com>
Date:   Thu Jan 24 18:08:09 2013 +0100

    libmsi: fix out-of-tree build

 Makefile.am        |    3 ++-
 libmsi/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1f4fd0e..bad7491 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,8 @@ wixl_SOURCES =					\
 
 wixl_CPPFLAGS =					\
 	-include config.h			\
-	-I $(top_srcdir)/include		\
+	-Iinclude				\
+	-I$(srcdir)/include			\
 	$(WIXL_CFLAGS)				\
 	-DG_LOG_DOMAIN=\""wixl"\"		\
 	-DLOCALEDIR=\""$(localedir)"\"		\
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am
index 5e7e971..58e511b 100644
--- a/libmsi/Makefile.am
+++ b/libmsi/Makefile.am
@@ -4,7 +4,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmsi-1.0.pc
 lib_LTLIBRARIES = libmsi.la
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(srcdir) -I. \
 	      $(GLIB_CFLAGS) $(GSF_CFLAGS) $(GOBJECT_CFLAGS)
 
 AM_CFLAGS = -Wunused -Wimplicit