X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7a6ee7aed88d3b6592ec08abc4563eca2729a652..44248b7f0d70535cd92e56612f3dc7f2e2fd583c:/make-dist

diff --git a/make-dist b/make-dist
index 8f3a7bfa67..4abe8177d7 100755
--- a/make-dist
+++ b/make-dist
@@ -33,7 +33,7 @@ progname="$0"
 ### Print out each line we read, for debugging's sake.
 ### set -v
 
-## Don't protect any files.
+## Don't restrict access to any files.
 umask 0
 
 update=yes
@@ -144,8 +144,10 @@ 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/[a-z]*.el lisp/[a-z]*/[a-z]*.el \
+      leim/[a-z]*.el leim/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el
+ls -1 lisp/[a-z]*.elc lisp/[a-z]*/[a-z]*.elc \
+      leim/[a-z]*.elc 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,16 +156,24 @@ 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
-  if ! grep -q "dontcompilefiles:.* $file\($\| \)" lisp/Makefile; then
-    if [ "$file" != site-init.el ] && [ "$file" != site-load.el ] \
-       && [ "$file" != site-start.el ] && [ "$file" != default.el ]; then
-      bogosities="$file $bogosities"
-    fi
+  file1=`echo $file | sed -e "s|.*/||"`
+  if ! grep -q "dontcompilefiles:.* $file1\($\| \)" lisp/Makefile; then
+    case $file in
+      site-init.el | site-load.el | site-start.el | default.el)
+        ;;
+      term/*)
+        ;;
+      *)
+        bogosities="$file $bogosities"
+	;;
+    esac
   fi
 done
 if [ x"${bogosities}" != x"" ]; then
@@ -173,7 +183,7 @@ 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 leim -name '[a-zA-Z0-9]??????????*.el' -print`
 if [ "$long" != "" ]; then
   echo "The following .el file names are too long:"
   echo "$long"
@@ -192,13 +202,17 @@ then
 
   (cd man; make info)
 
-  echo "Recompiling Lisp files"
+  echo "Updating finder, custom and autoload data"
 
-  $EMACS -batch -f batch-byte-recompile-directory lisp
+  (cd lisp; make updates EMACS=$EMACS)
 
-  echo "Updating finder, custom and autoload data"
+  echo "Updating leim-list.el"
+
+  (cd leim; make leim-list.el EMACS=$EMACS)
+
+  echo "Recompiling Lisp files"
 
-  (cd lisp; make updates)
+  $EMACS -batch -f batch-byte-recompile-directory lisp leim
 fi
 
 echo "Making lisp/MANIFEST"
@@ -239,12 +253,12 @@ echo "Updating version number in README"
    '$1 " " $2 " " $3 " " $4 " " $5 == "This directory tree holds version" { $6 = version; print $0 }
     $1 " " $2 " " $3 " " $4 " " $5 != "This directory tree holds version"' \
    version=${version} README > tmp.README
- mv tmp.README README)
+ mv -f tmp.README README)
 
 
 echo "Creating subdirectories"
 for subdir in lisp site-lisp leim real-leim real-leim/CXTERM-DIC \
-	      real-leim/SKK real-leim/skk real-leim/quail \
+	      real-leim/SKK-DIC real-leim/skk real-leim/quail \
 	      src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
 	      nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet \
 	      etc etc/e lock cpp info man msdos vms; do
@@ -298,10 +312,10 @@ 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/README SKK/SKK-JISYO.L ../${tempdir}/real-leim/SKK
+ ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC
  ln skk/*.el skk/*.elc ../${tempdir}/real-leim/skk
  ln quail/*.el quail/*.elc ../${tempdir}/real-leim/quail
 
@@ -309,7 +323,10 @@ echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
  rm -f TAGS =* */=*)
 
 ### Move the real-leim directory outside of Emacs proper.
-(cd ${tempparent}; mv ${emacsname}/real-leim ${emacsname}-leim)
+(cd ${tempparent}
+ mkdir ${emacsname}-leim
+ mkdir ${emacsname}-leim/${emacsname}
+ mv ${emacsname}/real-leim ${emacsname}-leim/${emacsname}/leim)
 
 echo "Making links to \`src'"
 ### Don't distribute =*.[ch] files, or the configured versions of
@@ -328,12 +345,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
@@ -543,7 +560,7 @@ if [ "${make_tar}" = yes ]; then
   (cd ${tempparent} ; tar cvf - ${emacsname} ) \
     | ${default_gzip} \
     > ${emacsname}.tar${gzip_extension}
-  (cd ${tempparent} ; tar cvf - ${emacsname}-leim ) \
+  (cd ${tempparent}/${emacsname}-leim ; tar cvf - ${emacsname} ) \
     | ${default_gzip} \
     > ${emacsname}-leim.tar${gzip_extension}
 fi