From: Jim Meyering <meyering@redhat.com>
Date: Sun, 2 Mar 2008 09:14:58 +0000 (+0100)
Subject: * bootstrap: Sync from gnulib.
X-Git-Tag: v6.11~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d622ad088b4eb0dfdcd6f935b6b51b4165c4d1bf;p=thirdparty%2Fcoreutils.git

* bootstrap: Sync from gnulib.
---

diff --git a/bootstrap b/bootstrap
index 480d403610..b3e165257e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -96,6 +96,11 @@ package=`sed -n "$extract_package_name" configure.ac` || exit
 gnulib_name=lib$package
 
 build_aux=build-aux
+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
+
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files="
 	$build_aux/install-sh
@@ -491,11 +496,11 @@ gnulib_tool_options="\
  --import\
  --no-changelog\
  --aux-dir $bt/$build_aux\
- --doc-base $bt/doc\
+ --doc-base $bt/$doc_base\
  --lib $gnulib_name\
- --m4-base $bt/m4/\
- --source-base $bt/lib/\
- --tests-base $bt/tests\
+ --m4-base $bt/$m4_base/\
+ --source-base $bt/$source_base/\
+ --tests-base $bt/$tests_base\
  --local-dir $local_gl_dir\
  $gnulib_tool_option_extras\
 "