diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-24 01:13:04 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-24 01:19:26 +0100 |
| commit | a34409f0ab805c7f83cecc2f520bada748a07584 (patch) | |
| tree | 3473d9b0d9618dc82d8bccb2384bdd44dcf4e51b | |
| parent | 5fe2bfee7631572b39f59307d7076dbaa9b6fc5e (diff) | |
| download | automake-a34409f0ab805c7f83cecc2f520bada748a07584.tar.gz | |
[ng] cleanup: after the merge master -> ng/master done recently
* t/distcheck-pr18286.sh: Slightly simplify and tighten by assuming
that $MAKE is GNU make.
* lib/am/configure.am: Use $(am.chars.empty) rather than $(am__empty)
for the internal variable always expansing to the empty string.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | lib/am/configure.am | 4 | ||||
| -rw-r--r-- | t/distcheck-pr18286.sh | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/am/configure.am b/lib/am/configure.am index 92f96162d..b528d9e74 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -71,11 +71,11 @@ $(am.relpath.makefile): %MAKEFILE-DEPS% $(top_builddir)/config.status esac; ## Avoid the "deleted header file" problem for the dependencies. -## Add the trailing "$(am__empty)" to trick Automake into not spuriously +## Add the trailing "$(am.chars.empty)" to trick Automake into not spuriously ## complaining about "duplicated targets" in case the %MAKEFILE-IN-DEPS% ## list expands to a single target that is also declared in some ## user-defined rule. -?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS% $(am__empty): +?HAVE-MAKEFILE-IN-DEPS?%MAKEFILE-IN-DEPS% $(am.chars.empty): am.dist.common-files += $(am.relpath.makefile.am) diff --git a/t/distcheck-pr18286.sh b/t/distcheck-pr18286.sh index fe8961287..fd3451db1 100644 --- a/t/distcheck-pr18286.sh +++ b/t/distcheck-pr18286.sh @@ -58,13 +58,12 @@ $AUTOMAKE -a $MAKE check # Oops, we failed to distribute some required files! -run_make -e FAIL -M distcheck -$FGREP '../../test_data.txt' output +run_make -e FAIL -E distcheck +$FGREP '../../test_data.txt' stderr # But if we distribute them, everything will be OK. echo 'EXTRA_DIST = test_data.txt gen-testdata.sh' >> Makefile.am -using_gmake || $MAKE Makefile $MAKE distcheck : |