summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Hrdina <phrdina@redhat.com>2019-12-11 10:19:21 +0100
committerPavel Hrdina <phrdina@redhat.com>2020-01-17 16:04:26 +0100
commita1a18c6ab55869d3b00cf8c32e0e2262a10c8ce7 (patch)
tree9ebded5275432037eab2564826361172aae94dda
parent4aeb0cc4d7876f9a2c6a024a32d883808096da77 (diff)
downloadlibvirt-a1a18c6ab55869d3b00cf8c32e0e2262a10c8ce7.tar.gz
bootstrap.conf: disable VC ignore files
We already ignore most of these files and the .gitignore files as well. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--.gitignore5
-rw-r--r--bootstrap.conf3
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2139d176da..949bd3bc5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,12 @@
/INSTALL
/aclocal.m4
/autom4te.cache
-/build-aux/.gitignore
/build-aux/compile
+/build-aux/config.guess
+/build-aux/config.sub
/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
/build-aux/missing
/build-aux/test-driver
/config.h.in
diff --git a/bootstrap.conf b/bootstrap.conf
index 13dd239fd1..5ff3374ded 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -81,6 +81,8 @@ copy=true
bootstrap_sync=true
+vc_ignore=
+
# Tell gnulib to:
# require LGPLv2+
@@ -95,6 +97,7 @@ gnulib_tool_option_extras="\
--lgpl=2\
--makefile-name=gnulib.mk\
--avoid=pt_chown\
+ --no-vc-files\
"
local_gl_dir=gnulib/local