[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-546-g64ef2cf

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=64ef2cf59d363914f995c3b227b21d9dc7210726

The branch, master has been updated
       via  64ef2cf59d363914f995c3b227b21d9dc7210726 (commit)
       via  ab323bcc12b86490a45f9fd6fbbc12d3cc1ea38d (commit)
      from  f9313bc5abd69cbb1d6dea36b8906ff4af1ef822 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64ef2cf59d363914f995c3b227b21d9dc7210726
Merge: f9313bc ab323bc
Author: Stefano Lattarini <address@hidden>
Date:   Tue Dec 21 02:02:56 2010 +0100

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    7 +++++++
 tests/subdir5.test |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a9a50a..c80c2ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-21  Stefano Lattarini  <address@hidden>
 
+       Fix sed-related buglet in test "subdir5.test"
+       * tests/subdir5.test: Always terminate text passed to the
+       `i' sed command with a newline, to work around limitations
+       in e.g. older OpenBSD sed.
+
+2010-12-21  Stefano Lattarini  <address@hidden>
+
        Fix spurious failures in tests on AC_CONFIG_AUX_DIR.
        * tests/auxdir7.test: Do not try to needlessly overwrite the files
        `install-sh' and `missing'.  This avoid spurious failures in "make
diff --git a/tests/subdir5.test b/tests/subdir5.test
index 6eb3aaa..5633ac6 100755
--- a/tests/subdir5.test
+++ b/tests/subdir5.test
@@ -69,7 +69,8 @@ $MAKE
 
 sed <configure.in >configure.tmp -e '/^AC_OUTPUT$/i\
 AC_CONFIG_FILES([maude/Makefile])\
-m4_include([confile.m4])'
+m4_include([confile.m4])\
+' # last newline required by older OpenBSD sed
 mv -f configure.tmp configure.in
 
 cat configure.in # might be useful for debugging


hooks/post-receive
-- 
GNU Automake