diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-15 17:40:09 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-01-15 17:57:33 +0100 |
| commit | 5db22a16ba0a6d2ba01fa8360481d80a0c40c964 (patch) | |
| tree | 291e76e229508a971e36bca51bd83356ee4b5319 /automake.in | |
| parent | a23d5bdc04af351b3fde8243b711601d049249d0 (diff) | |
| parent | 05c02989174d490b842c46cb8f25fb8b601a7c4f (diff) | |
| download | automake-5db22a16ba0a6d2ba01fa8360481d80a0c40c964.tar.gz | |
Merge branch 'maint'
* maint:
gnupload: moved to gnulib
sync: gitlog-to-changelog from gnulib upstream
test defs: backport optimized 'using_gmake' implementation
tests: unify some tests on "make -n", reducing duplication
vala: use "$(am__cd) $(srcdir)", not "cd $(srcdir)"
+ Extra edits:
* tests/maken3.test: Carry over (with necessary adjustments) the
code from maken4.test that determines whether $MAKE supports the
special '.MAKE' target.
Diffstat (limited to 'automake.in')
| -rw-r--r-- | automake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/automake.in b/automake.in index 7f2750c6b..086e217a4 100644 --- a/automake.in +++ b/automake.in @@ -5901,7 +5901,7 @@ sub lang_vala_finish_target ($$) $output_rules .= "\$(srcdir)/${derived}_vala.stamp: \$(${derived}_SOURCES)\n". - "\t${verbose}cd \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n". + "\t${verbose}\$(am__cd) \$(srcdir) && ${compile} \$(${derived}_SOURCES)\n". "\t${silent}touch \$@\n"; push_dist_common ("${derived}_vala.stamp"); |