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>

diff --git a/.gitignore b/.gitignore
index 2139d176da84b2ca65bb49b11d0a7d301853fadc..949bd3bc5a26047fc48df51fe6460594b6d422f8 100644 (file)
--- 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 13dd239fd1236fe07d93c159cd28e6946aa6bd06..5ff3374ded8b2f5b5be5bfd7538daf735b74e0fb 100644 (file)
--- 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