From 82fa0659f9834b3b0a2b5a27f23c25e605124cf2 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 4 Dec 2015 01:13:45 +0000
Subject: [PATCH 1/2] build: Fix include path for builddir != srcdir

We need to add $(top_builddir)/lib to the inclusion path, otherwise the
build will fail.

This has broken gnome-continuous builds of xdg-app.
---
 lib/Makefile.am.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile.am.inc b/lib/Makefile.am.inc
index 0ec65b9a..1c1e2dbe 100644
--- a/lib/Makefile.am.inc
+++ b/lib/Makefile.am.inc
@@ -53,7 +53,8 @@ libxdg_app_la_SOURCES = \
 libxdg_app_la_CFLAGS = \
 	$(HIDDEN_VISIBILITY_CFLAGS)		\
 	-DXDG_APP_COMPILATION \
-	-I$(srcdir)/lib \
+	-I$(top_srcdir)/lib \
+	-I$(top_builddir)/lib \
 	$(AM_CFLAGS) \
 	$(BASE_CFLAGS) \
 	$(OSTREE_CFLAGS) \
@@ -79,7 +80,8 @@ test_libxdg_app_SOURCES = \
 
 test_libxdg_app_CFLAGS = \
 	$(BASE_CFLAGS) \
-	-I$(srcdir)/lib \
+	-I$(top_srcdir)/lib \
+	-I$(top_builddir)/lib \
 	$(NULL)
 
 test_libxdg_app_LDADD = \

From 19c9a25be68e45e6c08b20b72eee4e542b4f40aa Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 4 Dec 2015 01:14:53 +0000
Subject: [PATCH 2/2] build: Switch to olddir after autoreconf

Otherwise this won't work:

  $ mkdir _build && cd _build
  $ ../autogen.sh

As `autoreconf` won't find configure.ac.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 14a7e833..619802ee 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,6 @@ fi
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch INSTALL
 
-cd "$olddir"
 if ! test -f libglnx/README.md; then
     git submodule update --init
 fi
@@ -27,4 +26,5 @@ sed -e 's,$(libglnx_srcpath),'${srcdir}/libglnx,g < libglnx/Makefile-libglnx.am
 
 autoreconf --force --install --verbose || exit $?
 
+cd "$olddir"
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"