From 3a655908ea57ba3846005e7ba333b107a6bd6281 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Thu, 28 Feb 2008 16:48:03 +0200
Subject: [PATCH] (source_base, m4_base, doc_base, tests_base): New variables.
 (gnulib_tool_options): Do not hardcode base directories, use the above
 variables instead.

---
 build-aux/bootstrap | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 6fa1553db..87a279821 100755
--- a/build-aux/bootstrap
+++ b/build-aux/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
@@ -490,11 +495,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\
 "
-- 
2.11.0