diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-05-17 15:51:21 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-05-17 15:52:34 +0200 |
| commit | 43ec8aecbf9fe8dda07d1909be21c055ee9d7ee0 (patch) | |
| tree | f722a37bd7d961d779edc1c69dfbeef66bd7d6a1 | |
| parent | fcf2f56062e384455ec8b1aed943af33f20c27c7 (diff) | |
| download | automake-43ec8aecbf9fe8dda07d1909be21c055ee9d7ee0.tar.gz | |
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'.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | automake.in | 4 | ||||
| -rwxr-xr-x | tests/vala2.test | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -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 03ab8ed39..bab8c4222 100755 --- 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 07a57f797..e559540d6 100755 --- 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 |