[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] bootstrap: fix an error when gnulib is not used as a git submodu
From: |
Giuseppe Scrivano |
Subject: |
[PATCH] bootstrap: fix an error when gnulib is not used as a git submodule. |
Date: |
Mon, 17 May 2010 15:26:42 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
another small patch for bootstrap.
The redirect is needed because "git COMMAND -h" sends output to stderr.
Cheers,
Giuseppe
>From d868757ec0cb028e9b81a89a32d5bebecafe10f2 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <address@hidden>
Date: Mon, 17 May 2010 15:16:57 +0200
Subject: [PATCH] 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.
---
ChangeLog | 8 ++++++++
build-aux/bootstrap | 6 ++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c556076..684b818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-17 Giuseppe Scrivano <address@hidden>
+
+ 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 <address@hidden>
Avoid autoconf warnings about AM_ICONV.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index a9a778a..490701e 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2010-04-30.16; # UTC
+scriptversion=2010-05-17.13; # UTC
# Bootstrap this package from checked-out sources.
@@ -409,6 +409,7 @@ git_modules_config () {
}
gnulib_path=`git_modules_config submodule.gnulib.path`
+test -n "$gnulib_path" || gnulib_path="gnulib"
# Get gnulib files.
@@ -424,7 +425,8 @@ case ${GNULIB_SRCDIR--} in
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
--
1.7.1
- [PATCH] bootstrap: fix an error when gnulib is not used as a git submodule.,
Giuseppe Scrivano <=