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 2c425bbfb1eb9d604f18287e1f74cc84dfcb690e..a9d4ba4fc2052898d67cf9ee7ef97fd7fd6d0bd6 100644 (file)
--- 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 c4926d4e78cc29b8ba0eb1b5b5fa14483d63d4fc..db4bc5933f22b675f3fa9f19f0e98451f7554484 100644 (file)
--- 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 \