Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14187:07245aecd139
bootstrap: avoid failure when there is no .gitmodules file
": ${gnulib_path=gnulib}" fails to set $gnulib_path when that variable
has been assigned to, even when its value is the empty string.
* build-aux/bootstrap (gnulib_path): Test explicitly for an empty
"$gnulib_path", rather than using ${gnulib_path=gnulib}.
Reported by John W. Eaton <jwe@gnu.org>.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Fri, 14 Jan 2011 09:43:00 +0100 |
| parents | cd4635d4dbe6 |
| children | 87bb0468d75c |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-01-14 Jim Meyering <meyering@redhat.com> + + bootstrap: avoid failure when there is no .gitmodules file + ": ${gnulib_path=gnulib}" fails to set $gnulib_path when that variable + has been assigned to, even when its value is the empty string. + * build-aux/bootstrap (gnulib_path): Test explicitly for an empty + "$gnulib_path", rather than using ${gnulib_path=gnulib}. + Reported by John W. Eaton <jwe@gnu.org>. + 2011-01-19 Paul Eggert <eggert@cs.ucla.edu> assume <ctype.h>, ..., <time.h> exist
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-11-20.03; # UTC +scriptversion=2011-01-14.08; # UTC # Bootstrap this package from checked-out sources. @@ -462,7 +462,7 @@ } gnulib_path=`git_modules_config submodule.gnulib.path` -: ${gnulib_path=gnulib} +test -z "$gnulib_path" && gnulib_path=gnulib # Get gnulib files.