(rmail-summary-rmail-update): When looking for

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index af056e4..fb60c85 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -144,8 +144,8 @@ them, and try again." >&2
 fi
 
 ### Check for .elc files with no corresponding .el file.
-ls -1 lisp/[a-z]*.el lisp/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el
-ls -1 lisp/[a-z]*.elc lisp/[a-z]*/[a-z]*.elc > /tmp/elc
+ls -1 {lisp,leim}/[a-z]*.el {lisp,leim}/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el
+ls -1 {lisp,leim}/[a-z]*.elc {lisp,leim}/[a-z]*/[a-z]*.elc > /tmp/elc
 bogosities="`comm -13 /tmp/el /tmp/elc`"
 if [ "${bogosities}" != "" ]; then
   echo "The following .elc files have no corresponding .el files:"
@@ -154,8 +154,10 @@ fi
 rm -f /tmp/el /tmp/elc
 
 ### Check for .el files with no corresponding .elc file.
-(cd lisp; ls -1 [a-z]*.el [a-z]*/[a-z]*.el) > /tmp/el
-(cd lisp; ls -1 [a-z]*.elc [a-z]*/[a-z]*.elc) | sed 's/\.elc$/.el/' > /tmp/elc
+((cd lisp; ls -1 [a-z]*.el [a-z]*/[a-z]*.el)
+ (cd leim; ls -1 [a-z]*.el [a-z]*/[a-z]*.el)) > /tmp/el
+((cd lisp; ls -1 [a-z]*.elc [a-z]*/[a-z]*.elc)
+ (cd leim; ls -1 [a-z]*.elc [a-z]*/[a-z]*.elc)) | sed 's/\.elc$/.el/' > /tmp/elc
 losers="`comm -23 /tmp/el /tmp/elc`"
 bogosities=
 for file in $losers; do
@@ -179,7 +181,8 @@ fi
 rm -f /tmp/el /tmp/elc
 
 ### Check for .el files that would overflow the 14-char limit if compiled.
-long=`find lisp -name '[a-zA-Z0-9]??????????*.el' -print`
+long=`find lisp -name '[a-zA-Z0-9]??????????*.el' -print
+      find leim -name '[a-zA-Z0-9]??????????*.el' -print`
 if [ "$long" != "" ]; then
   echo "The following .el file names are too long:"
   echo "$long"
@@ -198,10 +201,6 @@ then
 
   (cd man; make info)
 
-  echo "Recompiling Lisp files"
-
-  $EMACS -batch -f batch-byte-recompile-directory lisp
-
   echo "Updating finder, custom and autoload data"
 
   (cd lisp; make updates EMACS=$EMACS)
@@ -209,6 +208,10 @@ then
   echo "Updating leim-list.el"
 
   (cd leim; make leim-list.el EMACS=$EMACS)
+
+  echo "Recompiling Lisp files"
+
+  $EMACS -batch -f batch-byte-recompile-directory lisp leim
 fi
 
 echo "Making lisp/MANIFEST"
@@ -308,7 +311,7 @@ echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
 ### Don't distribute TAGS, or =*.el files.
 (cd leim
  ln Makefile.in makefile.nt ../${tempdir}/real-leim
- ln ChangeLog.? README ../${tempdir}/real-leim
+ ln ChangeLog README ../${tempdir}/real-leim
 
  ln CXTERM-DIC/*.tit ../${tempdir}/real-leim/CXTERM-DIC
  ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC
@@ -341,12 +344,12 @@ echo "Making links to \`src'"
      # test -f appears to succeed for a symlink
      if test -L ../${tempdir}/src/$file; then
        rm ../${tempdir}/src/$file
-       cp $file ../${tempdir}/src
+       cp -p $file ../${tempdir}/src
        chmod a-w ../${tempdir}/src/$file
      fi
    else
      rm ../${tempdir}/src/$file
-     cp $file ../${tempdir}/src
+     cp -p $file ../${tempdir}/src
      chmod a-w ../${tempdir}/src/$file
    fi
  done