bug-gnulib
[Top][All Lists]
Advanced

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

[PATCH] bootstrap: compute gnulib_extra_files after updating build_aux


From: Bruce Korb
Subject: [PATCH] bootstrap: compute gnulib_extra_files after updating build_aux
Date: Tue, 05 Apr 2011 13:43:50 -0700
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101206 SUSE/3.1.7 Thunderbird/3.1.7

* build-aux/bootstrap (gnulib_extra_files): bootstrap.conf may
change build_aux or also supply gnulib_extra_files.  Handle correctly.
---
 ChangeLog           |    6 ++++++
 build-aux/bootstrap |   27 ++++++++++++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6fc0ef3..d192e37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-05  Bruce Korb  <address@hidden>
+
+       bootstrap: compute gnulib_extra_files after updating build_aux
+       * build-aux/bootstrap (gnulib_extra_files): bootstrap.conf may
+       change build_aux or also supply gnulib_extra_files.  Handle correctly.
+
 2011-04-05  Simon Josefsson  <address@hidden>

        * top/maint.mk (sc_prohibit_empty_lines_at_EOF): Don't trigger
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index f004ad3..ba16c7f 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-03-03.12; # UTC
+scriptversion=2011-04-05.20; # UTC

 # Bootstrap this package from checked-out sources.

@@ -130,18 +130,7 @@ 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
-        $build_aux/missing
-        $build_aux/mdate-sh
-        $build_aux/texinfo.tex
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
-        doc/INSTALL
-"
+gnulib_extra_files=''

 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
 gnulib_tool_option_extras=
@@ -229,6 +218,18 @@ case "$0" in
   *) test -r "$0.conf" && . ./"$0.conf" ;;
 esac

+# Extra files from gnulib, which override files from other sources.
+test -z "${gnulib_extra_files}" && \
+  gnulib_extra_files="
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
+"

 if test "$vc_ignore" = auto; then
   vc_ignore=
--
1.7.3.4



reply via email to

[Prev in Thread] Current Thread [Next in Thread]