From: Stefano Lattarini Date: Sun, 1 Jan 2012 09:39:10 +0000 (+0100) Subject: Merge branch 'deprecate-lzma' into maint X-Git-Tag: v1.11.2b~13^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a461709e2be1394951a01fc9f08f6b4bacaad9b;p=thirdparty%2Fautomake.git Merge branch 'deprecate-lzma' into maint * deprecate-lzma: dist: obsolete support for lzma (superseded by xz and lzip) --- 2a461709e2be1394951a01fc9f08f6b4bacaad9b diff --cc doc/automake.texi index 4bae611b1,976c2f81b..dd87e93f9 --- a/doc/automake.texi +++ b/doc/automake.texi @@@ -8666,16 -8666,11 +8666,16 @@@ environment variable. For example, @sa Generate a gzip tar archive of the distribution. @trindex dist-gzip +@item @code{dist-lzip} +Generate a @samp{lzip} tar archive of the distribution. @command{lzip} +archives are frequently smaller than @command{bzip2}-compressed archives. +@trindex dist-lzip + @item @code{dist-lzma} - Generate an @samp{lzma} tar archive of the distribution. @command{lzma} - archives are frequently smaller than @command{bzip2}-compressed archives. + Generate an @samp{lzma} tar archive of the distribution. The @samp{lzma} format is obsolete, you should use the @samp{xz} format - instead. + instead. @emph{Support for @samp{lzma}-compressed archives will be + removed in the next major Automake release.} @trindex dist-lzma @item @code{dist-shar} diff --cc lib/Automake/Options.pm index 388d4b901,a176a2774..e3d23ae46 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@@ -264,7 -272,7 +272,7 @@@ sub _process_option_list (\%$@ elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo' || $_ eq 'dist-shar' || $_ eq 'dist-zip' || $_ eq 'dist-tarZ' || $_ eq 'dist-bzip2' - || $_ eq 'dist-lzip' || $_ eq 'dist-lzma' || $_ eq 'dist-xz' - || $_ eq 'dist-xz' ++ || $_ eq 'dist-lzip' || $_ eq 'dist-xz' || $_ eq 'no-dist-gzip' || $_ eq 'no-dist' || $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex' || $_ eq 'readme-alpha' || $_ eq 'check-news'