aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2013-03-02 18:43:30 -0800
committerGlenn Morris <[email protected]>2013-03-02 18:43:30 -0800
commit4aff132c639133b168aac40308afdc5ec8f4e9f3 (patch)
tree987e7953d3eb0a9bb1667a0b735b696754deac4a
parent0273a428450950cf846767982cdb77cc9937a1f3 (diff)
* make-dist: Remove lzma (it's replaced by xz).
-rw-r--r--ChangeLog4
-rwxr-xr-xmake-dist6
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 84d9987cce..2737f6284b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-03 Glenn Morris <[email protected]>
+
+ * make-dist: Remove lzma (it's replaced by xz).
+
2013-03-01 Paul Eggert <[email protected]>
Merge from gnulib, incorporating:
diff --git a/make-dist b/make-dist
index a6410421b4..283defe8a7 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= ;;