[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.2-239-g2868ff8

[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=2868ff8ca1792a7d5298923aff49647a754bc23e

The branch, master has been updated
       via  2868ff8ca1792a7d5298923aff49647a754bc23e (commit)
       via  1a93e9857e4f211769147fe9d0e9ffe6326c38fe (commit)
       via  978f2d7b51b0c93d09663635202964f7be2665aa (commit)
      from  ae1f40f55d32d5f4fe6887ba38c56c169de83d57 (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 2868ff8ca1792a7d5298923aff49647a754bc23e
Merge: 1a93e98 978f2d7
Author: Stefano Lattarini <address@hidden>
Date:   Sun Aug 12 14:12:52 2012 +0200

    Merge branch 'maint'
    
    * maint:
      cleanup: remove stale references to 'lzma' option

commit 1a93e9857e4f211769147fe9d0e9ffe6326c38fe
Author: Stefano Lattarini <address@hidden>
Date:   Sun Aug 12 13:43:54 2012 +0200

    cleanup: remove unused transform '%HAVE-MANS%'
    
    * automake.in (preprocess_file): Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 automake.in |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/automake.in b/automake.in
index 8b8c405..95ecbef 100644
--- a/automake.in
+++ b/automake.in
@@ -3700,7 +3700,7 @@ sub handle_dist ()
     {
       my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
       $archive_defined ||=
-       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz);
+       grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip xz);
       error (option 'no-dist-gzip',
             "no-dist-gzip specified but no dist-* specified,\n"
             . "at least one archive format must be enabled")
@@ -6793,7 +6793,6 @@ sub preprocess_file ($%)
                 => $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '',
 
                 'XZ'          => !! option 'dist-xz',
-                'LZMA'        => !! option 'dist-lzma',
                 'LZIP'        => !! option 'dist-lzip',
                 'BZIP2'       => !! option 'dist-bzip2',
                 'COMPRESS'    => !! option 'dist-tarZ',
@@ -6803,7 +6802,6 @@ sub preprocess_file ($%)
 
                 'INSTALL-INFO' =>  ! option 'no-installinfo',
                 'INSTALL-MAN'  =>  ! option 'no-installman',
-                'HAVE-MANS'    => !! var ('MANS'),
                 'CK-NEWS'      => !! option 'check-news',
 
                 'SUBDIRS'      => !! var ('SUBDIRS'),


hooks/post-receive
-- 
GNU Automake