From: Glenn Morris <rgm@gnu.org>
Date: Sun, 3 Mar 2013 02:43:30 +0000 (-0800)
Subject: * make-dist: Remove lzma (it's replaced by xz).
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~642
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4aff132c639133b168aac40308afdc5ec8f4e9f3;p=emacs.git

* make-dist: Remove lzma (it's replaced by xz).
---

diff --git a/ChangeLog b/ChangeLog
index 84d9987ccea..2737f6284b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-03  Glenn Morris  <rgm@gnu.org>
+
+	* make-dist: Remove lzma (it's replaced by xz).
+
 2013-03-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib, incorporating:
diff --git a/make-dist b/make-dist
index a6410421b49..283defe8a7d 100755
--- a/make-dist
+++ b/make-dist
@@ -83,10 +83,6 @@ while [ $# -gt 0 ]; do
     "--bzip2")
       default_gzip="bzip2"
     ;;
-    ## Same with lzma.
-    "--lzma")
-      default_gzip="lzma"
-    ;;
     ## Same with xz.
     "--xz")
       default_gzip="xz"
@@ -107,7 +103,6 @@ while [ $# -gt 0 ]; do
       echo ""
       echo "  --bzip2	use bzip2 instead of gzip"
       echo "  --clean-up	delete staging directories when done"
-      echo "  --lzma	use lzma instead of gzip"
       echo "  --xz		use xz instead of gzip"
       echo "  --no-compress	don't compress"
       echo "  --newer=TIME	don't include files older than TIME"
@@ -518,7 +513,6 @@ if [ "${make_tar}" = yes ]; then
   fi
   case "${default_gzip}" in
     bzip2) gzip_extension=.bz2 ;;
-    lzma)  gzip_extension=.lzma ;;
     xz)  gzip_extension=.xz ;;
     gzip)  gzip_extension=.gz ; default_gzip="gzip --best";;
        *)  gzip_extension= ;;