summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-11-13 21:17:31 +0100
committerJim Meyering <meyering@redhat.com>2011-11-13 21:18:36 +0100
commite34092a7d59dd2b452ad27b172c37966f7e16cc2 (patch)
tree6b725dd9391442dad808940a3393289721b130ca /bootstrap
parentf09c9629813a71310b70ed401051ae533a69763c (diff)
downloadgrep-e34092a7d59dd2b452ad27b172c37966f7e16cc2.tar.gz
maint: update bootstrap and init.sh from gnulib
* tests/init.sh: Update from gnulib. * bootstrap: Likewise.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap17
1 files changed, 2 insertions, 15 deletions
diff --git a/bootstrap b/bootstrap
index b286beb5..f76db9ae 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2011-06-22.06; # UTC
+scriptversion=2011-08-11.17; # UTC
# Bootstrap this package from checked-out sources.
@@ -800,20 +800,7 @@ slurp() {
echo "$me: $dir/$file overrides $1/$dir/$file"
else
copied=$copied$sep$file; sep=$nl
- if test $file = gettext.m4; then
- echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
- rm -f $dir/$file
- sed '
- /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
- AC_DEFUN([AM_INTL_SUBDIR], [])
- /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
- AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
- $a\
- AC_DEFUN([gl_LOCK_EARLY], [])
- ' $1/$dir/$file >$dir/$file
- else
- cp_mark_as_generated $1/$dir/$file $dir/$file
- fi
+ cp_mark_as_generated $1/$dir/$file $dir/$file
fi || exit
done