[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCHv2 2/3] 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.
---

The commit date lies - I've been sitting on an earlier form of
this patch since:
https://www.redhat.com/archives/libvir-list/2010-April/msg01337.html

Fortunately, the rest of the hunks in that earlier version have
since been taken care of in the meantime.

 bootstrap.conf   |   10 ++++++++++
 docs/Makefile.am |    2 +-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 2c425bb..a9d4ba4 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 c4926d4..db4bc59 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 \
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]