Add more quotes.

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index 7730a46..80758bc 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -95,6 +95,7 @@ fi
 ### that the shell is running in an Emacs window.)
 if [ $update = yes ];
 then
+  unset EMACS_UNIBYTE
   if [ -f src/emacs ];
   then
     EMACS=`pwd`/src/emacs
@@ -174,7 +175,8 @@ then
   bogosities=
   for file in $losers; do
     file1=`echo $file | sed -e "s|.*/||"`
-    if ! grep -q "dontcompilefiles:.* $file1\($\| \)" lisp/Makefile; then
+    if ! sed -n -e "/^DONTCOMPILE/,/[^\\]\$/p" lisp/Makefile |
+        grep -q "[     ]$file1\($\| \)"; then
       case $file in
        site-init.el | site-load.el | site-start.el | default.el)
          ;;
@@ -211,15 +213,15 @@ if [ $update = yes ];
 then
   echo "Updating Info files"
 
-  (cd man; make info)
+  (cd man; make -f Makefile.in srcdir=. info)
 
   echo "Updating finder, custom and autoload data"
 
-  (cd lisp; make updates EMACS=$EMACS)
+  (cd lisp; make updates EMACS="$EMACS")
 
   echo "Updating leim-list.el"
 
-  (cd leim; make leim-list.el EMACS=$EMACS)
+  (cd leim; make leim-list.el EMACS="$EMACS")
 
   echo "Recompiling Lisp files"
 
@@ -326,6 +328,9 @@ echo "Making links to \`lisp' and its subdirectories"
    if [ -f $file/README ]; then
      ln $file/README ../${tempdir}/lisp/$file
    fi
+   if [ -f $file/ChangeLog ]; then
+     ln $file/ChangeLog ../${tempdir}/lisp/$file
+   fi
  done )
 
 echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
@@ -443,7 +448,7 @@ echo "Making links to \`nt/inc/netinet'"
 
 echo "Making links to \`nt/icons'"
 (cd nt/icons
- ln [a-z]*.ico ../../../${tempdir}/nt/icons)
+ ln [a-z]*.ico ../../${tempdir}/nt/icons)
 
 echo "Making links to \`msdos'"
 (cd msdos