Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index 986f784..707b6e2 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -41,8 +41,8 @@ LC_MESSAGES=
 LANG=
 export LANGUAGE LC_ALL LC_MESSAGES LANG
 
-## Don't restrict access to any files.
-umask 0
+## Remove unnecessary restrictions on file access.
+umask 022
 
 update=yes
 check=yes
@@ -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"
@@ -113,7 +109,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"
@@ -328,7 +323,7 @@ done
 
 echo "Making links to \`lisp' and its subdirectories"
 files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \
- -o -name 'README*' \)`
+ -o -name 'README' \)`
 
 ### Don't distribute site-init.el, site-load.el, or default.el.
 for file in lisp/Makefile.in lisp/makefile.w32-in $files; do
@@ -358,7 +353,7 @@ echo "Making links to \`leim' and its subdirectories"
 
 echo "Making links to \`build-aux'"
 (cd build-aux
- ln compile config.guess config.sub depcomp ../${tempdir}/build-aux
+ ln compile config.guess config.sub depcomp msys-to-w32 ../${tempdir}/build-aux
  ln install-sh missing move-if-change update-subdirs ../${tempdir}/build-aux)
 
 echo "Making links to \`build-aux/snippet'"
@@ -408,6 +403,8 @@ echo "Making links to \`nt'"
  ln emacs-x86.manifest emacs-x64.manifest emacs.rc ../${tempdir}/nt
  ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt
  ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
+ ln Makefile.in gnulib.mk ../${tempdir}/nt
+ ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt
  ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt)
 
 echo "Making links to \`nt/inc' and its subdirectories"
@@ -456,8 +453,13 @@ echo "Making links to \`lwlib'"
  ln *.[ch] *.in ../${tempdir}/lwlib
  ln README ChangeLog ../${tempdir}/lwlib)
 
+## It is important to distribute admin/ because it contains sources
+## for generated lisp/international/uni-*.el files.
 echo "Making links to \`admin' and its subdirectories"
 for f in `find admin -type f`; do
+  case $f in
+    admin/unidata/Makefile) continue ;;
+  esac
   ln $f $tempdir/$f
 done
 
@@ -476,6 +478,9 @@ echo "Making links to \`etc' and its subdirectories"
 for f in `find etc -type f`; do
   case $f in
     etc/DOC*|etc/*.pyc) continue ;;
+    ## Arguably we should not exclude *.ps.
+    etc/refcards/*.aux|etc/refcards/*.dvi|etc/refcards/*.log|etc/refcards/*.ps)
+      continue ;;
   esac
   ln $f $tempdir/$f
 done
@@ -543,7 +548,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= ;;