Merge branch 'maint' into branch-1.11

* maint:
  tests: fix spurious failure due to autom4te caching
  vala: fix name of temporary file used in vala rules
  vala tests: add missing 'valac' requirement, and other minor fixlets
  news: fix grammaro

5 files changed, 13 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index ebc071417..06d4213c3 100644
--- a/NEWS
+++ b/NEWS
@@ -40,7 +40,7 @@ New in 1.11.2a:
   - The master copy of the `gnupload' script is now maintained in gnulib,
     not in automake.
 
-  - The `missing' script don't try to wrap calls to `tar' anymore.
+  - The `missing' script doesn't try to wrap calls to `tar' anymore.
 
   - "make dist" doesn't wrap `tar' invocations with the `missing' script
     anymore.  Similarly, the obsolescent variable `$(AMTAR)' (which you
diff --git a/automake.in b/automake.in
index cd918b921..a18d5a58a 100644
--- a/automake.in
+++ b/automake.in
@@ -6105,9 +6105,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 > \$@-t\n".
+    "\t${silent}rm -f \$\@ && echo stamp > \$\@-t\n".
     "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n".
-    "\t${silent}mv -f \$@-t \$@\n";
+    "\t${silent}mv -f \$\@-t \$\@\n";
 
   push_dist_common ("${derived}_vala.stamp");
 
diff --git a/tests/lzma.test b/tests/lzma.test
index 7ee59f7ca..bf65aeae5 100755
--- a/tests/lzma.test
+++ b/tests/lzma.test
@@ -40,7 +40,8 @@ test: distcheck
 	test -f $(DIST_ARCHIVES)
 END
 
-$ACLOCAL --force
+rm -rf autom4te*.cache
+$ACLOCAL
 AUTOMAKE_fails
 grep "^configure\\.in:2:.*$errmsg" stderr
 
diff --git a/tests/vala-mix.test b/tests/vala-mix.test
index f597a7f87..73a07d93b 100755
--- a/tests/vala-mix.test
+++ b/tests/vala-mix.test
@@ -16,7 +16,7 @@
 
 # Vala sources and C sources in the same program.  Functional test.
 
-required='cc GNUmake'
+required='valac cc GNUmake'
 . ./defs || Exit 1
 
 set -e
@@ -96,8 +96,9 @@ have_generated_files ()
 # C files.
 have_generated_files
 
+# Remake rules are not uselessly triggered.
 $MAKE -q
-$MAKE -n | grep stamp && Exit 1
+$MAKE -n | $FGREP vala.stamp && Exit 1
 
 # Check the distribution.
 $MAKE distcheck
diff --git a/tests/vala.test b/tests/vala.test
index 9750942bd..fc179879c 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -85,4 +85,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
+
 :