[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] * build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 pat
From: |
Paul Eggert |
Subject: |
[PATCH] * build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch. |
Date: |
Thu, 11 Aug 2011 11:29:27 -0700 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.18) Gecko/20110617 Thunderbird/3.1.11 |
---
ChangeLog | 2 ++
build-aux/bootstrap | 17 ++---------------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3a798cf..ea534b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-08-11 Paul Eggert <address@hidden>
+ * build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch.
+
po/Makefile.in.in: fix make -q problem
* build-aux/po/Makefile.in.in (check-macro-version): Remove this
rule, since there's no file named 'check-macro-version' and its
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index b286beb..f76db9a 100755
--- a/build-aux/bootstrap
+++ b/build-aux/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
--
1.7.4.4
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] * build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch.,
Paul Eggert <=