Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

1 files changed, 3 insertions, 2 deletions

diff --git a/make-dist b/make-dist
index 16b90de239..34fb358ee7 100755
--- a/make-dist
+++ b/make-dist
@@ -385,7 +385,8 @@ echo "Making links to \`lib-src'"
  ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
  ln ChangeLog Makefile.in README ../${tempdir}/lib-src
  ln grep-changelog rcs2log ../${tempdir}/lib-src
- ln makefile.w32-in ../${tempdir}/lib-src)
+ ln makefile.w32-in ../${tempdir}/lib-src
+ ln update-game-score.exe.manifest ../${tempdir}/lib-src)
 
 echo "Making links to \`m4'"
 (cd m4
@@ -451,7 +452,7 @@ echo "Making links to \`lwlib'"
 echo "Making links to \`admin' and its subdirectories"
 for f in `find admin -type f`; do
   case $f in
-    admin/unidata/Makefile) continue ;;
+    */Makefile) [ -f $f.in ] && continue ;;
   esac
   ln $f $tempdir/$f
 done