diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-06 22:03:06 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-06 22:43:20 +0100 |
| commit | 8f3a565e9a708298be5e6fa136210c3ef4f5163d (patch) | |
| tree | 7776ec837bb30604786784d7ddb4b87c8d145d69 /t/lex-depend-grep.sh | |
| parent | 9fb499a9b6f4ee175ba8a8d7d00bd756e4242173 (diff) | |
| parent | 6357a630dc3cac6682a0f17b255104b4dd78f89a (diff) | |
| download | automake-8f3a565e9a708298be5e6fa136210c3ef4f5163d.tar.gz | |
Merge branch 'master' into ng/master (bug#13928 fixed by this)
Part of this merge is actually a no-op, since we had already fixed
Automake-NG so that the 'subdir-object' option (enabled by default)
would work when foo_SOURCES contains $(var).
OTOH, even Automake-NG suffered of the bug where built object files,
as well as dependency-tracking makefile fragments, could be placed
in $(srcdir) when a source file was specified as '$(srdir)/foo.c' or
'$(top_srcdir)/bar.c'. See bug#16375 and bug#15293.
* master:
deps: fix corner-case "make distclean" bug
compile: don't place built object files in $(srcdir), ever ...
tests: fix some bugs in an XFAILing test
deps: 'subdir-object' option now works when foo_SOURCES contains $(var)
NEWS: fix a typo
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/lex-depend-grep.sh')
| -rw-r--r-- | t/lex-depend-grep.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh index dedea2d31..70e5cb8d2 100644 --- a/t/lex-depend-grep.sh +++ b/t/lex-depend-grep.sh @@ -40,7 +40,7 @@ $AUTOMAKE -a $EGREP '([mj]oe|_[01234]|include|\.P)' Makefile.in # For debugging. for x in joe moe _0 _1 _2 _3 _4; do - grep "include.*$x\.Po" Makefile.in + $EGREP '\$\(DEPDIR\)/'"$x"'\.Po( |$)' Makefile.in done : |