[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-669-gb08103f

[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=b08103fedac9fbdf0a24f9192a901ea4b01e45af

The branch, maint has been updated
       via  b08103fedac9fbdf0a24f9192a901ea4b01e45af (commit)
      from  d266b5f7fb2fbb7fddb5b8515d57c32b45a50c67 (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 b08103fedac9fbdf0a24f9192a901ea4b01e45af
Author: Stefano Lattarini <address@hidden>
Date:   Sun Jan 22 10:44:42 2012 +0100

    vala: fix name of temporary file used in vala rules
    
    Unquoted `@' characters in a "..." string in the automake script
    were causing slightly wrong rules to be emitted in the generated
    Makefile.in; i.e., rules like:
    
      rm -f $@ && echo stamp > $10t
    
    instead of the expected:
    
      rm -f $@ && echo stamp > address@hidden
    
    * automake.in (lang_vala_finish_target): Fix that.
    * tests/vala.test: Enhance.

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

Summary of changes:
 automake.in     |    4 ++--
 tests/vala.test |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/automake.in b/automake.in
index 3c70b38..abca23d 100644
--- a/automake.in
+++ b/automake.in
@@ -6083,9 +6083,9 @@ sub lang_vala_finish_target ($$)
 # especially important on systems with sub-second timestamp resolution).
 # Thus we need to create the stamp file *before* invoking valac, and to
 # move it to its final location only after valac has been invoked.
-    "\t${silent}rm -f \$@ && echo stamp > address@hidden".
+    "\t${silent}rm -f \$\@ && echo stamp > address@hidden".
     "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
-    "\t${silent}mv -f address@hidden address@hidden";
+    "\t${silent}mv -f address@hidden address@hidden";
 
   push_dist_common ("${derived}_vala.stamp");
 
diff --git a/tests/vala.test b/tests/vala.test
index 442661d..70122c3 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -84,4 +84,9 @@ $FGREP 'baz.c' sub/Makefile.in
 $FGREP 'foo_vala.stamp:' sub/Makefile.in
 test `$FGREP -c '.stamp:' sub/Makefile.in` -eq 1
 
+# Check against regression for weird bug due to unescaped '@'
+# characters used in a "..." perl string when writing the vala
+# rules from automake.in.
+grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && Exit 1
+
 :


hooks/post-receive
-- 
GNU Automake