Merge branch 'master' into ng/master

* master:
  automake: remove an unused local variable
  distcheck: more resilient against possible failures
  cleanup: remove almost-unused global var 'am_relative_dir'

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

diff --cc automake.in
index a7f423b97c7e4c4123914c7b457fa794ed85e315,8b8c405c2390ef5003b637cba15e85ba29bdd98e..d6bd1b01747fbabb28d3d7c409fedd3e3e76372c
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -3270,23 -3755,21 +3270,17 @@@ sub handle_dist (
          push_dist_common ($file)
            if ($dir eq '.' || ! is_make_dir ($dir));
        }
 +      @configure_dist_common  = ();
      }
  
 -  # Files to distributed.  Don't use ->value_as_list_recursive
 -  # as it recursively expands '$(dist_pkgdata_DATA)' etc.
 -  my @dist_common = split (' ', rvar ('DIST_COMMON')->variable_value);
 -  @dist_common = uniq @dist_common;
 -  variable_delete 'DIST_COMMON';
 -  define_pretty_variable ('DIST_COMMON', TRUE, INTERNAL, @dist_common);
 -
 -  # Now that we've processed DIST_COMMON, disallow further attempts
 -  # to set it.
 +  # We don't expected further attempts to modify @dist_common
 +  # after this point, so disallow it, for extra safety.
    $handle_dist_run = 1;
  
-   # Scan EXTRA_DIST to see if we need to distribute anything from a
-   # subdir.  If so, add it to the list.  I didn't want to do this
-   # originally, but there were so many requests that I finally
-   # relented.
-   my $extra_dist = var ('EXTRA_DIST');
- 
 -  $transform{'DISTCHECK-HOOK'} = !! rule 'distcheck-hook';
 -  $transform{'GETTEXT'} = $seen_gettext && !$seen_gettext_external;
 +  define_variable ('am.dist.handle-distcheck-hook', INTERNAL,
 +                   rule ('distcheck-hook') ? 'yes' : '');
 +  define_variable ('am.dist.handle-gettext', INTERNAL,
 +                   $seen_gettext && !$seen_gettext_external ? 'yes' : '');
  
    # If the target 'dist-hook' exists, make sure it is run.  This
    # allows users to do random weird things to the distribution

diff --cc lib/am/distdir.am
Simple merge