From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 1 Feb 2016 11:24:58 +0000 (+0100)
Subject: include: Handle case when builddir == srcdir
X-Git-Tag: v1.3.2-rc1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d0e41a71910e0415a924648f44a0b00389a576a;p=thirdparty%2Flibvirt.git

include: Handle case when builddir == srcdir

In my previous commit a70f3b1c779120129 I've tried to fix case
when building from VPATH and a file wasn't being installed.
However, my fix broke non-VPATH build.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/include/Makefile.am b/include/Makefile.am
index 6b0b41e572..dde955e391 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -19,7 +19,8 @@
 virincdir = $(includedir)/libvirt
 
 allheaders = $(wildcard $(srcdir)/libvirt/*.h)
-virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h, $(allheaders))
+virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h \
+				 $(srcdir)/libvirt/libvirt-common.h, $(allheaders))
 virinc_HEADERS += libvirt/libvirt-common.h
 
 EXTRA_DIST = libvirt/libvirt-common.h.in