[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1d-174-g1a1c3ac

[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=1a1c3ac44cf1d831a8b460888c7402d9fec70023

The branch, master has been updated
       via  1a1c3ac44cf1d831a8b460888c7402d9fec70023 (commit)
       via  1021f5cf48784b6ed6b28834f14485b52b4c80e3 (commit)
       via  95b837cfa47c4d82cc4a3adc5cb6f8e736cacf72 (commit)
       via  560702945f154bbaa595da3da88a9b6770b026d2 (commit)
       via  25194b6274e0c336c40cd1903565cdc7afaabf7c (commit)
       via  d2ed35594beef64f55eb1680ee87d9f7997fb35c (commit)
      from  df3490b71af4c37a6df8aa6eacdeda8613438c20 (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 1a1c3ac44cf1d831a8b460888c7402d9fec70023
Merge: 95b837c 1021f5c
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 9 20:14:58 2013 +0200

    Merge branch 'maint'
    
    * maint:
      maint: re-run "make update-copyright" ...

commit 95b837cfa47c4d82cc4a3adc5cb6f8e736cacf72
Merge: df3490b 5607029
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 9 20:11:47 2013 +0200

    Merge branch 'maint'
    
    * maint:
      tests: avoid spurious failure with older flex (2.5.4)
      announcement: cater to more flexible NEWS format

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

Summary of changes:
 maintainer/maint.mk |    6 +++++-
 t/lex-multiple.sh   |    6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 56c52be..ac29a72 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -290,7 +290,11 @@ announcement: NEWS
          && X \
          && X "-*-*-*-" \
          && X \
-         && sed -n -e '/^~~~/q' -e p $(srcdir)/NEWS >> address@hidden \
+         && $(AWK) '\
+               ($$0 == "New in $(VERSION):") { wait_for_end=1; } \
+               (/^~~~/ && wait_for_end) { exit(0) } \
+               { print } \
+            ' <$(srcdir)/NEWS >> address@hidden \
          && mv -f address@hidden $@
 .PHONY: announcement
 CLEANFILES += announcement
diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
index e1c71a1..7383eaf 100755
--- a/t/lex-multiple.sh
+++ b/t/lex-multiple.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,11 +43,11 @@ liblex_a_SOURCES = 0.l
 
 # We need the output to always be named 'lex.yy.c', in order for
 # ylwrap to pick it up.
-liblex_foo_a_LFLAGS = -Pfoo --outfile=lex.yy.c
+liblex_foo_a_LFLAGS = -Pfoo -olex.yy.c
 liblex_foo_a_SOURCES = a.l
 
 # Ditto.
-liblex_bar_a_LFLAGS = -Pbar_ --outfile=lex.yy.c
+liblex_bar_a_LFLAGS = -Pbar_ -olex.yy.c
 liblex_bar_a_SOURCES = b.l
 END
 


hooks/post-receive
-- 
GNU Automake