From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 9 Oct 2015 09:20:06 +0000 (+0200)
Subject: src: Remove $(builddir) usage
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6c928996e6fa4b080e1b93f89831fabf16e71543;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

src: Remove $(builddir) usage

Commit 4e8032272f1704f7 used $(builddir) in the header search
path to fix a build issue; however, $(builddir) is not defined
by old autoconf versions such as the one available in CentOS 5,
resulting in the following error:

  cc1: error: /util: No such file or directory
  make[3]: *** [libvirt_driver_la-fdstream.lo] Error 1

Since $(builddir) is defined to always be '.', just use that
value directly instead.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 01e816af8..d5dd9fbf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ INCLUDES =	-I../gnulib/lib					\
 		-I../include					\
 		-I$(top_srcdir)/include				\
 		-I$(srcdir)/util				\
-		-I$(builddir)/util				\
+		-I./util					\
 		-DIN_LIBVIRT					\
 		-Dabs_topbuilddir="\"$(abs_topbuilddir)\""	\
 		-Dabs_topsrcdir="\"$(abs_topsrcdir)\""		\