From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 30 Dec 2014 21:51:26 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5d11f767dc15a2de2d6cbc12347e7cc121a1dd4;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  docs: "make distcheck" implementation details are not to be abused
  NEWS: improve and adjust in light of the oncoming 1.15 release
  shell-no-trail-bslash: improve diagnostic in case of failure

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

a5d11f767dc15a2de2d6cbc12347e7cc121a1dd4
diff --cc t/ax/shell-no-trail-bslash.in
index 353d4cde1,26979b617..197927f48
--- a/t/ax/shell-no-trail-bslash.in
+++ b/t/ax/shell-no-trail-bslash.in
@@@ -40,13 -41,16 +41,15 @@@ am_SHELL=${AM_TESTSUITE_SHELL-'@SHELL@'
  
    if test x${shell_command+"set"} != x"set"; then
      if test $# -gt 0; then
-       shell_command=$(cat "$1")
+       shell_script=$1
+       shell_command=$(cat <"$shell_script")
      else
 -      # Some make implementations, like *BSD's, pass the recipes to the
 -      # shell through its standard input.  Trying to run our extra checks
 -      # in this case would be too tricky, so we just skip them.
 -      exit 0
 +      echo "$0: fatal: no shell script given," \
 +            "nor a command given via the '-c' option" >&2
 +      exit 1
      fi
    fi
+   original_shell_command=$shell_command
  
    tab='	'
    nl='