From 3bd4c7ba16050bf582f1abc8246804316d22b673 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 1 Oct 2009 16:55:09 +0200
Subject: [PATCH] Fix build in separate build directory

* cfg.mk: use $(srcdir)/ prefix for Makefile.nonreentrant include
* examples/domain-events/events-c/Makefile.am tools/Makefile.am
  examples/hellolibvirt/Makefile.am: extend the include paths to
  use $(top_srcdir)/include too.
---
 cfg.mk                                      | 2 +-
 examples/domain-events/events-c/Makefile.am | 2 +-
 examples/hellolibvirt/Makefile.am           | 2 +-
 tools/Makefile.am                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index c217332ac2..44cfd17933 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -101,7 +101,7 @@ sc_prohibit_VIR_ERR_NO_MEMORY:
 	msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY		\
 	  $(_prohibit_regexp)
 
-include Makefile.nonreentrant
+include $(srcdir)/Makefile.nonreentrant
 sc_prohibit_nonreentrant:
 	@fail=0 ; \
 	for i in $(NON_REENTRANT) ; \
diff --git a/examples/domain-events/events-c/Makefile.am b/examples/domain-events/events-c/Makefile.am
index 60b15898c6..64457c2a84 100644
--- a/examples/domain-events/events-c/Makefile.am
+++ b/examples/domain-events/events-c/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I@top_srcdir@/include
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = event-test
 event_test_CFLAGS = $(WARN_CFLAGS)
 event_test_SOURCES = event-test.c
diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am
index 6ef2cc822f..8d108a710a 100644
--- a/examples/hellolibvirt/Makefile.am
+++ b/examples/hellolibvirt/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I@top_srcdir@/include
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_PROGRAMS = hellolibvirt
 hellolibvirt_CFLAGS = $(WARN_CFLAGS)
 hellolibvirt_SOURCES = hellolibvirt.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c48b203e52..941e93ec70 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -43,7 +43,7 @@ virsh_LDADD =							\
 		$(VIRSH_LIBS)
 virsh_CFLAGS = 							\
 		-I$(top_srcdir)/gnulib/lib -I../gnulib/lib	\
-		-I../include					\
+		-I../include -I$(top_srcdir)/include		\
 		-I$(top_srcdir)/src				\
 		-I$(top_srcdir)/src/util			\
 		-DGETTEXT_PACKAGE=\"$(PACKAGE)\"		\