From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 24 Dec 2014 00:13:04 +0000 (+0100)
Subject: [ng] cleanup: after the merge master -> ng/master done recently
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a34409f0ab805c7f83cecc2f520bada748a07584;p=thirdparty%2Fautomake.git

[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>
---

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
 
 :