From 7350b1c0f63daa61a87e25c1fefd11976861cf25 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Wed, 11 Jan 2012 16:17:17 +0100
Subject: [PATCH] Fix builddir != srcdir issue

Because pk-version.h ends up in the build directory, we need to ensure
that we look there when searching for includes.

https://bugs.freedesktop.org/show_bug.cgi?id=44678
---
 client/Makefile.am                    |    1 +
 contrib/command-not-found/Makefile.am |    1 +
 contrib/debuginfo-install/Makefile.am |    1 +
 contrib/gstreamer-plugin/Makefile.am  |    1 +
 src/Makefile.am                       |    1 +
 5 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/client/Makefile.am b/client/Makefile.am
index a1bff21..6458065 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -45,6 +45,7 @@ INCLUDES =						\
 	-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE	\
 	-DPK_COMPILATION				\
 	-DG_LOG_DOMAIN=\"PackageKit\"			\
+	-I$(top_builddir)/lib				\
 	-I$(top_srcdir)/lib				\
 	$(NULL)
 
diff --git a/contrib/command-not-found/Makefile.am b/contrib/command-not-found/Makefile.am
index 6451314..0c72c16 100644
--- a/contrib/command-not-found/Makefile.am
+++ b/contrib/command-not-found/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES =						\
 	-DPK_COMPILATION				\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 		\
+	-I$(top_builddir)/lib				\
 	-I$(top_srcdir)/lib
 
 libexec_PROGRAMS = pk-command-not-found
diff --git a/contrib/debuginfo-install/Makefile.am b/contrib/debuginfo-install/Makefile.am
index 83d6e00..9d8b8ba 100644
--- a/contrib/debuginfo-install/Makefile.am
+++ b/contrib/debuginfo-install/Makefile.am
@@ -23,6 +23,7 @@ INCLUDES =						\
 	-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE	\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 		\
+	-I$(top_builddir)/lib				\
 	-I$(top_srcdir)/lib
 
 bin_PROGRAMS = pk-debuginfo-install
diff --git a/contrib/gstreamer-plugin/Makefile.am b/contrib/gstreamer-plugin/Makefile.am
index 6b1b279..b62cac6 100644
--- a/contrib/gstreamer-plugin/Makefile.am
+++ b/contrib/gstreamer-plugin/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES =						\
 	-DVERSION="\"$(VERSION)\"" 			\
 	-DPK_DATA=\"$(pkgdatadir)\"			\
 	-DPK_DB_DIR=\""$(PK_DB_DIR)"\" 			\
+	-I$(top_builddir)/lib				\
 	-I$(top_srcdir)/lib				\
 	$(NULL)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f88d204..7526a6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,6 +41,7 @@ INCLUDES =						\
 	-DPK_COMPILATION				\
 	-DPOLKIT_LOCAL_I_KNOW_API_IS_SUBJECT_TO_CHANGE	\
 	-DG_LOG_DOMAIN=\"PackageKit\"			\
+	-I$(top_builddir)/lib				\
 	-I$(top_srcdir)/lib				\
 	$(NULL)
 
-- 
1.7.7.3