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 75e4b22..707b6e2 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -353,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'"
@@ -404,7 +404,7 @@ echo "Making links to \`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 msysconfig.sh mingw-cfg.site epaths.nt INSTALL.MSYS ../${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"
@@ -453,6 +453,8 @@ 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
@@ -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