(bogosities): Check subdirs of `lisp' also.

(etc): Really avoid symlinks now.
(lisp): Don't delete from subdirs the things we never copy.

1 files changed, 7 insertions, 7 deletions

diff --git a/make-dist b/make-dist
index 2fa3c31fbaa..8f3a7bfa67b 100755
--- 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 | sed 's/\.el$/.elc/' > /tmp/el
-ls -1 lisp/[a-z]*.elc > /tmp/elc
+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
 bogosities="`comm -13 /tmp/el /tmp/elc`"
 if [ "${bogosities}" != "" ]; then
   echo "The following .elc files have no corresponding .el files:"
@@ -154,8 +154,8 @@ fi
 rm -f /tmp/el /tmp/elc
 
 ### Check for .el files with no corresponding .elc file.
-(cd lisp; ls -1 [a-z]*.el) > /tmp/el
-(cd lisp; ls -1 [a-z]*.elc) | sed 's/\.elc$/.el/' > /tmp/elc
+(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
 losers="`comm -23 /tmp/el /tmp/elc`"
 bogosities=
 for file in $losers; do
@@ -292,7 +292,6 @@ echo "Making links to \`lisp' and its subdirectories"
    if [ -f $file/README ]; then
      ln $file/README ../${tempdir}/lisp/$file
    fi
-   rm -f $file/=* $file/TAGS
  done )
 
 echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
@@ -429,10 +428,11 @@ echo "Making links to \`etc'"
 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
 ### tex litter.
 (cd etc
- ln `ls -d * | grep -v 'RCS' | grep -v 'Old' | grep -v '^e$'` ../${tempdir}/etc
+ files=`ls -d * | grep -v 'RCS' | grep -v 'Old' | grep -v '^e$'`
+ ln $files ../${tempdir}/etc
  ## If we ended up with a symlink, or if we did not get anything
  ## due to a cross-device symlink, copy the file.
- for file in [a-zA-Z]*.[hcs] [a-zA-Z]*.in [a-zA-Z]*.opt; do
+ for file in $files; do
    if test -f ../${tempdir}/etc/$file; then
      # test -f appears to succeed for a symlink
      if test -L ../${tempdir}/etc/$file; then