Fix maintainer-check failures.

* automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
of plain `cd'.
* tests/vala2.test: Use `rm -f' instead of `rm'.

diff --git a/ChangeLog b/ChangeLog
index 84b79961204ba49d33b3ab16a29bbf536dcbf6d6..138091f61396ed0ee372a5febd317976a2404461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix maintainer-check failures.
+       * automake.in (lang_vala_finish_target): Use `$(am__cd)' instead
+       of plain `cd'.
+       * tests/vala2.test: Use `rm -f' instead of `rm'.
+
        Revert Automake license to GPLv2+.
        Automake will move to GPLv3+ once the Exception statement has
        been rewritten to use the new GPLv3 exception language.  This

diff --git a/automake.in b/automake.in
index 03ab8ed39f22e57fb485873bfeb04076216fd8e9..bab8c4222a3f2781e79ab02c7f2fd87bbf4dfb3c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5945,7 +5945,7 @@ sub lang_vala_finish_target ($$)
           $output_rules .= "\$(srcdir)/$file: \$(srcdir)/${derived}_vala.stamp\n".
             "\t\@if test -f \$@; then :; else \\\n".
             "\t  rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
-            "\t  cd \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) ${derived}_vala.stamp; \\\n".
+            "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) ${derived}_vala.stamp; \\\n".
             "\tfi\n"
             if $file =~ s/(.*)\.vala$/$1.c/;
         }
@@ -5965,7 +5965,7 @@ sub lang_vala_finish_target ($$)
              $output_rules .= "\$(srcdir)/$headerfile: \$(srcdir)/${derived}_vala.stamp\n".
                "\t\@if test -f \$@; then :; else \\\n".
                "\t  rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
-               "\t  cd \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) ${derived}_vala.stamp; \\\n".
+               "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) ${derived}_vala.stamp; \\\n".
                "\tfi\n";
 
              # valac is not used when building from dist tarballs

diff --git a/tests/vala2.test b/tests/vala2.test
index 07a57f7974cc5ef34c4cc89c765cacfe0cc94e93..e559540d66991e61d385f18e44fdbc2997a0fe07 100755 (executable)
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -70,7 +70,7 @@ $AUTOMAKE -a
 $MAKE
 
 # test rebuild rules
-rm src/zardoz.h
+rm -f src/zardoz.h
 $MAKE -C src zardoz.h
 
 $MAKE distcheck