X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/47854a55680b5809811caf72f66ecbe8289c2855..783b505b7bd8f28bdf73e8c34ae22e809cfe64db:/make-dist?ds=sidebyside

diff --git a/make-dist b/make-dist
index 6da62d83f2..a455fefb3b 100755
--- a/make-dist
+++ b/make-dist
@@ -7,7 +7,7 @@
 #### you should make sure that this script will include it.
 
 # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007  Free Software Foundation, Inc.
+#   2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -81,6 +81,14 @@ while [ $# -gt 0 ]; do
     "--compress")
       default_gzip="compress"
     ;;
+    ## Same with bzip2.
+    "--bzip2")
+      default_gzip="bzip2"
+    ;;
+    ## Same with lzma.
+    "--lzma")
+      default_gzip="lzma"
+    ;;
 
     "--snapshot")
       clean_up=yes
@@ -92,8 +100,10 @@ while [ $# -gt 0 ]; do
     "--help")
       echo "Usage: ${progname} [options]"
       echo ""
+      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"
@@ -318,15 +328,18 @@ for subdir in lisp site-lisp \
 	      leim/SKK-DIC leim/ja-dic leim/quail \
 	      src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
 	      nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
-	      etc etc/e etc/gnus etc/nxml \
+	      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/low-color etc/images/mail \
+	      etc/images/icons etc/images/icons/hicolor \
+	      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
@@ -498,7 +511,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)
@@ -526,15 +539,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
@@ -575,7 +580,7 @@ echo "Making links to \`etc'"
 ### tex litter.
 (cd etc
  files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \
-        | grep -v '^gnus$' | grep -v '^images$' | grep -v '^nxml$' \
+        | grep -v '^charsets$' | grep -v '^gnus$' | grep -v '^images$' | grep -v '^nxml$' \
         | grep -v '^refcards$' | grep -v '^tutorials$'| grep -v '^schema$'`
  ln $files ../${tempdir}/etc
  ## If we ended up with a symlink, or if we did not get anything
@@ -599,7 +604,7 @@ echo "Making links to \`etc'"
  rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
  rm -f TAGS)
 
-for dir in etc/e etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do
+for dir in etc/charsets etc/e etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
 	ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir}
@@ -625,7 +630,7 @@ for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \
 done
 
 for dir in etc/images/tree-widget/default etc/images/tree-widget/folder \
-    etc/images/smilies/grayscale  etc/images/smilies/medium ; do
+    etc/images/smilies/grayscale  etc/images/smilies/medium; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
      ln `ls -d * | grep -v CVS | grep -v RCS` ../../../../${tempdir}/${dir}
@@ -633,6 +638,15 @@ 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/*/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}
+     cd ../../../../../../${tempdir}/${dir}
+     rm -f *~ \#*\# *,v =* core)
+done
+
 echo "Making links to \`info'"
 # Don't distribute backups or autosaves.
 (cd info
@@ -733,7 +747,9 @@ if [ "${make_tar}" = yes ]; then
     )`
   fi
   case "${default_gzip}" in
+    bzip2)      gzip_extension=.bz2 ;;
     compress* ) gzip_extension=.Z ;;
+    lzma)       gzip_extension=.lzma ;;
     * )         gzip_extension=.gz ;;
   esac
   echo "Creating tar file"