X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/430d2ee2919b2d4693780f2474ba40148442d206..de56235e504a5fc198cc733bd8917ac7b58a3640:/make-dist

diff --git a/make-dist b/make-dist
index 9ab0388275..866b4351e9 100755
--- a/make-dist
+++ b/make-dist
@@ -8,23 +8,22 @@
 
 # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007, 2008  Free Software Foundation, Inc.
-#
+
 # This file is part of GNU Emacs.
 #
-# GNU Emacs is free software; you can redistribute it and/or modify
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 progname="$0"
 
@@ -85,6 +84,10 @@ while [ $# -gt 0 ]; do
     "--bzip2")
       default_gzip="bzip2"
     ;;
+    ## Same with lzma.
+    "--lzma")
+      default_gzip="lzma"
+    ;;
 
     "--snapshot")
       clean_up=yes
@@ -96,9 +99,10 @@ while [ $# -gt 0 ]; do
     "--help")
       echo "Usage: ${progname} [options]"
       echo ""
-      echo "  --bzip2		use bzip2 instead of gzip"
+      echo "  --bzip2	use bzip2 instead of gzip"
       echo "  --clean-up	delete staging directories when done"
       echo "  --compress	use compress instead of gzip"
+      echo "  --lzma	use lzma instead of gzip"
       echo "  --newer=TIME	don't include files older than TIME"
       echo "  --no-check	don't check for bad file names etc."
       echo "  --no-update	don't recompile or do analogous things"
@@ -326,14 +330,15 @@ for subdir in lisp site-lisp \
 	      etc etc/charsets etc/e etc/gnus etc/nxml \
 	      etc/images etc/images/ezimage etc/images/gnus etc/images/gud \
 	      etc/images/icons etc/images/icons/hicolor \
-	      etc/images/icons/hicolor/*x* etc/images/icons/hicolor/*x*/apps \
+	      etc/images/icons/hicolor/*x* etc/images/icons/hicolor/scalable \
+	      etc/images/icons/hicolor/*/apps etc/images/icons/hicolor/*/mimetypes \
 	      etc/images/low-color etc/images/mail \
 	      etc/images/smilies etc/images/smilies/grayscale \
 	      etc/images/smilies/medium etc/images/tree-widget \
 	      etc/images/tree-widget/default etc/images/tree-widget/folder \
 	      etc/refcards etc/schema etc/tutorials info doc doc/emacs \
 	      doc/misc doc/man doc/lispref doc/lispintro m4 msdos vms mac \
-	      mac/inc mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \
+	      mac/src mac/Emacs.app mac/Emacs.app/Contents \
 	      mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
 	      mac/Emacs.app/Contents/Resources/English.lproj
 do
@@ -505,7 +510,7 @@ echo "Making links to \`m4'"
 
 echo "Making links to \`nt'"
 (cd nt
- ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt
+ ln emacs.manifest emacs.rc config.nt [a-z]*.c ../${tempdir}/nt
  ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt
  ln [a-z]*.bat [a-z]*.h ../${tempdir}/nt
  ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt)
@@ -533,15 +538,7 @@ echo "Making links to \`nt/icons'"
 
 echo "Making links to \`mac'"
 (cd mac
- ln ChangeLog INSTALL README make-package *.xml *.MPW ../${tempdir}/mac)
-
-echo "Making links to \`mac/inc'"
-(cd mac/inc
- ln [a-z]*.h ../../${tempdir}/mac/inc)
-
-echo "Making links to \`mac/inc/sys'"
-(cd mac/inc/sys
- ln [a-z]*.h ../../../${tempdir}/mac/inc/sys)
+ ln ChangeLog INSTALL README make-package ../${tempdir}/mac)
 
 echo "Making links to \`mac/src'"
 (cd mac/src
@@ -640,7 +637,8 @@ for dir in etc/images/tree-widget/default etc/images/tree-widget/folder \
      rm -f *~ \#*\# *,v =* core)
 done
 
-for dir in etc/images/icons/hicolor/*x*/apps ; do
+for dir in etc/images/icons/hicolor/*/apps \
+    etc/images/icons/hicolor/*/mimetypes; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
      ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../../../${tempdir}/${dir}
@@ -750,6 +748,7 @@ if [ "${make_tar}" = yes ]; then
   case "${default_gzip}" in
     bzip2)      gzip_extension=.bz2 ;;
     compress* ) gzip_extension=.Z ;;
+    lzma)       gzip_extension=.lzma ;;
     * )         gzip_extension=.gz ;;
   esac
   echo "Creating tar file"