(Finternal_set_lisp_face_attribute): Revert last change.

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index 2b3c583..02c2c46 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  Free Software Foundation, Inc.
+#   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 #
@@ -305,7 +305,7 @@ mkdir ${tempdir}
 echo "Making links to top-level files"
 ln INSTALL README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in configure configure.in ${tempdir}
-ln config.bat make-dist update-subdirs vpath.sed ${tempdir}
+ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
 ### Copy these files; they're cross-filesystem symlinks.
 cp mkinstalldirs ${tempdir}
 cp config.sub ${tempdir}
@@ -510,7 +510,7 @@ echo "Making links to \`m4'"
 
 echo "Making links to \`nt'"
 (cd nt
- ln emacs.manifest emacs.rc config.nt [a-z]*.c ../${tempdir}/nt
+ ln emacs.manifest emacs.rc emacsclient.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)
@@ -672,7 +672,7 @@ echo "Making links to \`info'"
  cd ../${tempdir}/info
  # Avoid an error when expanding the wildcards later.
  ln emacs dummy~ ; ln emacs \#dummy\#
- rm -f *~ \#*\# core)
+ rm -f *~ \#*\# core .arch-inventory)
 
 echo "Making links to \`doc/emacs'"
 (cd doc/emacs
@@ -725,7 +725,8 @@ echo "Making links to \`doc/lispintro'"
 
 echo "Making links to \`doc/man'"
 (cd doc/man
- ln *.1 ../../${tempdir}/doc/man)
+ ln *.1 ../../${tempdir}/doc/man
+ ln ChangeLog ../../${tempdir}/doc/man)
 
 ### It would be nice if they could all be symlinks to top-level copy, but
 ### you're not supposed to have any symlinks in distribution tar files.