[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.2-236-gae1f40f

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=ae1f40f55d32d5f4fe6887ba38c56c169de83d57

The branch, master has been updated
       via  ae1f40f55d32d5f4fe6887ba38c56c169de83d57 (commit)
       via  ae1d413cb4ba860ea8e38e6748ff706d3252fa29 (commit)
       via  c1dd6cce90b5ad4f2292ebedfd081a660b8dc5e9 (commit)
       via  133307b9ee9ac87cbfdcb8d093f192c34d3bd1f8 (commit)
      from  03b7cf99c697f1b9d601de50b8fcd4698d254d21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ae1f40f55d32d5f4fe6887ba38c56c169de83d57
Merge: 03b7cf9 ae1d413
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 10 16:51:55 2012 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 automake.in       |   13 ++-----------
 lib/am/distdir.am |    6 +++---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/automake.in b/automake.in
index faa2d29..8b8c405 100644
--- a/automake.in
+++ b/automake.in
@@ -481,9 +481,7 @@ my $am_file = 'BUG';
 ## Variables reset by &initialize_per_input.  ##
 ## ------------------------------------------ ##
 
-# Basename and relative dir of the input file.
-my $am_relative_dir;
-# Same but wrt Makefile.in.
+# Relative dir of the output makefile.
 my $relative_dir;
 
 # Greatest timestamp of the output's dependencies (excluding
@@ -634,7 +632,6 @@ sub initialize_per_input ()
 {
     reset_local_duplicates ();
 
-    $am_relative_dir = undef;
     $relative_dir = undef;
 
     $output_deps_greatest_timestamp = 0;
@@ -3771,12 +3768,6 @@ sub handle_dist ()
   # to set it.
   $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;
 
@@ -7892,7 +7883,6 @@ sub generate_makefile ($$)
   my ($makefile, @inputs) = split (/:/, $output_files{$makefile_in});
 
   $relative_dir = dirname ($makefile);
-  $am_relative_dir = dirname ($makefile_am);
 
   read_main_am_file ($makefile_am, $makefile_in);
   if (handle_options)
@@ -8006,6 +7996,7 @@ sub generate_makefile ($$)
       return;
     }
 
+  my $am_relative_dir = dirname ($makefile_am);
   mkdir ($am_relative_dir, 0755) if ! -d $am_relative_dir;
 
   # We make sure that 'all:' is the first target.
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 3063b8a..1f2eef0 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -422,9 +422,9 @@ distcheck: dist
 ## Make the new source tree read-only.  Distributions ought to work in
 ## this case.  However, make the top-level directory writable so we
 ## can make our new subdirs.
-       chmod -R a-w $(distdir); chmod u+w $(distdir)
-       mkdir $(distdir)/_build
-       mkdir $(distdir)/_inst
+       chmod -R a-w $(distdir)
+       chmod u+w $(distdir)
+       mkdir $(distdir)/_build $(distdir)/_inst
 ## Undo the write access.
        chmod a-w $(distdir)
 ## With GNU make, the following command will be executed even with "make -n",


hooks/post-receive
-- 
GNU Automake