From: Eric Blake <eblake@redhat.com>
Date: Fri, 18 Feb 2011 21:40:35 +0000 (-0700)
Subject: maint: fix 'make dist' in VPATH build
X-Git-Tag: CVE-2011-1146~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1dd7e090087aa1502359213493f9372e52bff7;p=thirdparty%2Flibvirt.git

maint: fix 'make dist' in VPATH build

A diff of 'make dist' from in-tree vs. a VPATH build showed
that we were missing docs/api_extension/*.patch files, but
shipping other files that we didn't need.

* bootstrap.conf (gnulib_extra_files): Don't distribute files we
don't care about.
* docs/Makefile.am (patches): Perform wildcard correctly.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 2c425bbfb1..a9d4ba4fc2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -165,6 +165,16 @@ tar        -
 # Automake requires that ChangeLog exist.
 touch ChangeLog || exit 1
 
+# Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
+gnulib_extra_files="
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
+"
+
 
 bootstrap_epilogue()
 {
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c4926d4e78..db4bc5933f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -64,7 +64,7 @@ dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) todo.html.in \
       $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in))
 dot_html = $(dot_html_in:%.html.in=%.html)
 
-patches = $(wildcard api_extension/*.patch)
+patches = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/api_extension/*.patch))
 
 xml = \
   libvirt-api.xml \