diff options
author | Jim Meyering <meyering@redhat.com> | 2010-05-19 12:34:15 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2010-05-26 07:58:06 +0200 |
commit | ffd9adf0715436c94d2a1a95070e3688e047328b (patch) | |
tree | 2f3020f25971717e235d97ec9b6be64557bad30a /bootstrap | |
parent | 813a03992cfbb90384e1893f1239d93ec387541b (diff) | |
download | grep-ffd9adf0715436c94d2a1a95070e3688e047328b.tar.gz |
maint: update helper scripts from gnulib
* tests/init.sh: Update from gnulib.
* bootstrap: Likewise.
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-02-24.17; # UTC +scriptversion=2010-04-30.16; # UTC # Bootstrap this package from checked-out sources. @@ -424,7 +424,7 @@ case ${GNULIB_SRCDIR--} in trap cleanup_gnulib 1 2 13 15 - git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow= + git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow= git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || cleanup_gnulib @@ -437,7 +437,7 @@ case ${GNULIB_SRCDIR--} in if test -d "$GNULIB_SRCDIR"/.git && \ git_modules_config submodule.gnulib.url >/dev/null; then echo "$0: getting gnulib files..." - if git submodule --help|grep reference > /dev/null; then + if git submodule -h|grep -- --reference > /dev/null; then # Prefer the one-liner available in git 1.6.4 or newer. git submodule update --init --reference "$GNULIB_SRCDIR" \ "$gnulib_path" || exit $? @@ -819,7 +819,7 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} } - ' po/Makevars.template >po/Makevars + ' po/Makevars.template >po/Makevars || exit 1 if test -d runtime-po; then # Similarly for runtime-po/Makevars, but not quite the same. @@ -833,7 +833,7 @@ if test $with_gettext = yes; then a\ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} } - ' <po/Makevars.template >runtime-po/Makevars + ' po/Makevars.template >runtime-po/Makevars || exit 1 # Copy identical files from po to runtime-po. (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) |