aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-01-09 20:00:02 -0800
committerGlenn Morris2013-01-09 20:00:02 -0800
commit39aff4a79fc24148c317c3eacb2cb92e46981aa3 (patch)
tree10363db4bee46cfba36cea50cf0fd6c07b39726d
parent50620051800d14a47558fb4379d7cbae5d81f6a1 (diff)
downloademacs-39aff4a79fc24148c317c3eacb2cb92e46981aa3.tar.gz
emacs-39aff4a79fc24148c317c3eacb2cb92e46981aa3.zip
* make-dist: Add options for xz compression and no compression.
-rw-r--r--ChangeLog4
-rwxr-xr-xmake-dist10
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dcbc4747fb..05d15b7dc36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-01-10 Glenn Morris <rgm@gnu.org>
2
3 * make-dist: Add options for xz compression and no compression.
4
12013-01-04 Glenn Morris <rgm@gnu.org> 52013-01-04 Glenn Morris <rgm@gnu.org>
2 6
3 * info/dir: Add htmlfontify. 7 * info/dir: Add htmlfontify.
diff --git a/make-dist b/make-dist
index 60afb0c618f..788dca3462c 100755
--- a/make-dist
+++ b/make-dist
@@ -87,6 +87,13 @@ while [ $# -gt 0 ]; do
87 "--lzma") 87 "--lzma")
88 default_gzip="lzma" 88 default_gzip="lzma"
89 ;; 89 ;;
90 ## Same with xz.
91 "--xz")
92 default_gzip="xz"
93 ;;
94 "--no-compress")
95 default_gzip="cat"
96 ;;
90 97
91 "--snapshot") 98 "--snapshot")
92 clean_up=yes 99 clean_up=yes
@@ -101,6 +108,8 @@ while [ $# -gt 0 ]; do
101 echo " --bzip2 use bzip2 instead of gzip" 108 echo " --bzip2 use bzip2 instead of gzip"
102 echo " --clean-up delete staging directories when done" 109 echo " --clean-up delete staging directories when done"
103 echo " --lzma use lzma instead of gzip" 110 echo " --lzma use lzma instead of gzip"
111 echo " --xz use xz instead of gzip"
112 echo " --no-compress don't compress"
104 echo " --newer=TIME don't include files older than TIME" 113 echo " --newer=TIME don't include files older than TIME"
105 echo " --no-check don't check for bad file names etc." 114 echo " --no-check don't check for bad file names etc."
106 echo " --no-update don't recompile or do analogous things" 115 echo " --no-update don't recompile or do analogous things"
@@ -510,6 +519,7 @@ if [ "${make_tar}" = yes ]; then
510 case "${default_gzip}" in 519 case "${default_gzip}" in
511 bzip2) gzip_extension=.bz2 ;; 520 bzip2) gzip_extension=.bz2 ;;
512 lzma) gzip_extension=.lzma ;; 521 lzma) gzip_extension=.lzma ;;
522 xz) gzip_extension=.xz ;;
513 gzip) gzip_extension=.gz ; default_gzip="gzip --best";; 523 gzip) gzip_extension=.gz ; default_gzip="gzip --best";;
514 *) gzip_extension= ;; 524 *) gzip_extension= ;;
515 esac 525 esac