Merge branch 'master' into ng/master

* master:
  tests: make script 'shell-no-trail-bslash' simpler and more robust
  texinfo: remove hack about info files in CLEANFILES variables

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

diff --cc bin/automake.in
index d699ec6ee206daf82a820e4e8cb8b993d724f58b,c6bf923a9c4639f9850f05ee18c833430124c5a9..6f08c4b99220c0bada618491d37611253337ee5d
--- 1/bin/automake.in
--- 2/bin/automake.in
+++ b/bin/automake.in
@@@ -2559,16 -2946,8 +2559,7 @@@ sub handle_texinfo_helpe
    my (@infobase, @info_deps_list, @texi_deps);
    my %versions;
    my $done = 0;
 -  my (@mostly_cleans, @texi_cleans, @maint_cleans) = ('', '', '');
  
-   # Build a regex matching user-cleaned files.
-   my $d = var 'DISTCLEANFILES';
-   my $c = var 'CLEANFILES';
-   my @f = ();
-   push @f, $d->value_as_list_recursive (inner_expand => 1) if $d;
-   push @f, $c->value_as_list_recursive (inner_expand => 1) if $c;
-   @f = map { s|[^A-Za-z_0-9*\[\]\-]|\\$&|g; s|\*|[^/]*|g; $_; } @f;
-   my $user_cleaned_files = '^(?:' . join ('|', @f) . ')$';
- 
    foreach my $texi
        ($info_texinfos->value_as_list_recursive (inner_expand => 1))
      {
@@@ -2783,8 -3147,10 +2743,8 @@@
                                          new Automake::Location,
                                          TEXI     => $texi,
                                          VTI      => $vti,
-                                         STAMPVTI => "${soutdir}stamp-$vti",
-                                         VTEXI    => "${soutdir}${vtexi}");
+                                         STAMPVTI => "${src_outdir}stamp-$vti",
 -                                        VTEXI    => "${src_outdir}$vtexi",
 -                                        MDDIR    => $conf_dir,
 -                                        DIRSTAMP => $dirstamp);
++                                        VTEXI    => "${src_outdir}$vtexi");
        }
      }
  

diff --cc t/ax/shell-no-trail-bslash.in
index 82217e56431654a7c429c1023a123fc740bf0fd3,322495824cf01c5286aa6e0816eae4cd66eb8498..353d4cde1c006c8ab59b0e1e295b2bf95bd9a5ac
--- 1/t/ax/shell-no-trail-bslash.in
--- 2/t/ax/shell-no-trail-bslash.in
+++ b/t/ax/shell-no-trail-bslash.in
@@@ -58,10 -59,10 +58,10 @@@ am_SHELL=${AM_TESTSUITE_SHELL-'@SHELL@'
  
    case "$shell_command" in
      *\\)
-       printf '%s\n' "$0: recipe ends with backslash character" >&2
-       printf '%s\n' "=== BEGIN recipe" >&2
-       printf '%s\n' "${am_shell_command-}" >&2
-       printf '%s\n' "=== END recipe" >&2
+       printf '%s\n' "$0: recipe/script ends with backslash character" >&2
+       printf '%s\n' "=== BEGIN recipe/script" >&2
 -      printf '%s\n' "${am_shell_command-}" >&2
++      printf '%s\n' "${shell_command-???}" >&2
+       printf '%s\n' "=== END recipe/script" >&2
        exit 1
        ;;
    esac

diff --cc t/self-check-shell-no-trail-bslash.sh
Simple merge