merge emacs-23

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index ec100c6..2fb443d 100755 (executable)
--- 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, 2008, 2009  Free Software Foundation, Inc.
+#   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 #
@@ -340,7 +340,7 @@ for subdir in lisp site-lisp \
              etc/images/gud 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/low-color etc/images/mail etc/images/mpc \
              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 \
@@ -460,7 +460,7 @@ echo "Making links to \`src'"
  ln makefile.w32-in ../${tempdir}/src
  ln .gdbinit .dbxinit ../${tempdir}/src
  cd ../${tempdir}/src
- rm -f config.h epaths.h Makefile Makefile.c
+ rm -f config.h epaths.h Makefile Makefile.c buildobj.h
  rm -f =* TAGS)
 
 echo "Making links to \`src/bitmaps'"
@@ -602,7 +602,7 @@ echo "Making links to \`etc'"
    fi
  done
  cd ../${tempdir}/etc
- rm -f fns*.el
+ rm -f fns*.el *.pyc
  rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
  rm -f TAGS)
 
@@ -626,7 +626,7 @@ echo "Making links to \`etc/images'"
 
 for dir in etc/images/custom etc/images/ezimage etc/images/gnus \
     etc/images/gud etc/images/icons etc/images/low-color etc/images/mail \
-    etc/images/smilies ; do
+    etc/images/mpc etc/images/smilies ; do
     echo "Making links to \`${dir}'"
     (cd ${dir}
      for f in *; do