[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.2-98-gae1d413

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

The branch, maint has been updated
       via  ae1d413cb4ba860ea8e38e6748ff706d3252fa29 (commit)
       via  c1dd6cce90b5ad4f2292ebedfd081a660b8dc5e9 (commit)
       via  133307b9ee9ac87cbfdcb8d093f192c34d3bd1f8 (commit)
      from  21ec3a527390dc996ae09172b625a576f82ebcba (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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 1ae5470..43e1a90 100644
--- a/automake.in
+++ b/automake.in
@@ -476,9 +476,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
@@ -629,7 +627,6 @@ sub initialize_per_input ()
 {
     reset_local_duplicates ();
 
-    $am_relative_dir = undef;
     $relative_dir = undef;
 
     $output_deps_greatest_timestamp = 0;
@@ -3882,12 +3879,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;
 
@@ -8097,7 +8088,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)
@@ -8211,6 +8201,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 f636a1e..07f0502 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -449,9 +449,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