Mercurial > hg > octave-kai > gnulib-hg
changeset 14525:681d7647cda3
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.
author | Bruce Korb <bkorb@gnu.org> |
---|---|
date | Tue, 05 Apr 2011 15:19:13 -0700 |
parents | 15d19f52ff01 |
children | 722fe41bb185 |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 19 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-05 Bruce Korb <bkorb@gnu.org> + + 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 Eric Blake <eblake@redhat.com> bootstrap: preserve git whitelist item sorting
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -130,18 +130,7 @@ 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 @@ *) 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=