diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-03-07 23:15:04 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-03-07 23:16:56 +0100 |
| commit | 38799f27b49b8a8390e0afbdeff86ebfdb5425d7 (patch) | |
| tree | 5b8cf3f83f8d244b8e52deb99142a3fdc02e154c /tests/subdir5.test | |
| parent | 8290baa7eeabeb14ff98ec3e256983143200b37f (diff) | |
| parent | d63c932a6d73bfa67e76af4bb0a0f1bb07198f1c (diff) | |
| download | automake-38799f27b49b8a8390e0afbdeff86ebfdb5425d7.tar.gz | |
Merge branch 'master' into ng/master
* master: (62 commits)
cosmetics: fix repeated changelog entry heading
tests: remove useless sleep from tests on remake rules
news: describe recently-fixed bug in vala support
depcomp: add support for IBM xlc/xlC compilers
tests: do not clobber the $CC set by AM_PROG_CC_C_O
tests: explicitly state that our lexers do not require unistd.h
scripts: support -I <dir> -L <dir> and -l <lib> for cl in compile
maint: drop 'Automake::Struct' module
maint: require perl 5.6 throughout
cosmetics: remove useless escaping for "'" character
test defs: remove redundant and unused requirements
tests: fix spurious failure on case-insensitive file systems
news: more about planned backward incompatibilities
maintcheck: fix few spurious failures
tests: fix spurious failure due to exported MAKEINFO
tests: fix spurious failure in a vala test
self checks: relax tests on cleanup
news: add entry about recent 'ar-lib' changes
scripts: recognize the "q", "s" and "S" actions/modifiers in ar-lib
tests: fix (harmless) botched merge
...
+ Extra non-trivial edits:
* automake.in (lang_vala_finish_target): Don't pass $(AM_MAKEFLAGS)
to recursive make invocations.
Diffstat (limited to 'tests/subdir5.test')
| -rwxr-xr-x | tests/subdir5.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/subdir5.test b/tests/subdir5.test index ed8eb7564..a74c746d0 100755 --- a/tests/subdir5.test +++ b/tests/subdir5.test @@ -15,8 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test to make sure that adding a new directory works. -# This test runs `make' from the top-level directory, the sister test -# `subdir8.test' do it from a subdirectory. +# This test runs 'make' from the top-level directory, the sister test +# 'subdir8.test' do it from a subdirectory. # PR automake/46 . ./defs || Exit 1 @@ -69,7 +69,7 @@ grep '^SUBDIRS = *maude *$' Makefile test -f maude/Makefile # Then we add a new directory by modifying a file included (through -# `m4_include') by configure.ac. +# 'm4_include') by configure.ac. mkdir maude2 # Modified configure dependencies must be newer than config.status. $sleep |