Mercurial > gnulib
changeset 13349:e3f87df3b2a9
bootstrap: fix an error when gnulib is not used as a git submodule
* build-aux/bootstrap (gnulib_path): If its length is zero then
assign "gnulib" to it.
* build-aux/bootstrap: Redirect "git clone -h" stderr to stdout.
| author | Giuseppe Scrivano <gscrivano@gnu.org> |
|---|---|
| date | Mon, 17 May 2010 15:26:42 +0200 |
| parents | 417aae33eae3 |
| children | 36478f5238e1 |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 16 23:49:00 2010 +0200 +++ b/ChangeLog Mon May 17 15:26:42 2010 +0200 @@ -1,3 +1,10 @@ +2010-05-17 Giuseppe Scrivano <gscrivano@gnu.org> + + bootstrap: fix an error when gnulib is not used as a git submodule + * build-aux/bootstrap (gnulib_path): If its length is zero then + assign "gnulib" to it. + * build-aux/bootstrap: Redirect "git clone -h" stderr to stdout. + 2010-05-16 Bruno Haible <bruno@clisp.org> Avoid autoconf warnings about AM_ICONV.
--- a/build-aux/bootstrap Sun May 16 23:49:00 2010 +0200 +++ b/build-aux/bootstrap Mon May 17 15:26:42 2010 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-04-30.16; # UTC +scriptversion=2010-05-17.18; # UTC # Bootstrap this package from checked-out sources. @@ -409,6 +409,7 @@ } gnulib_path=`git_modules_config submodule.gnulib.path` +: ${gnulib_path=gnulib} # Get gnulib files. @@ -424,7 +425,8 @@ trap cleanup_gnulib 1 2 13 15 - git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow= + shallow= + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || cleanup_gnulib