(vc-diff): If file is unchanged, ask for the version

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 2fa3c31fbaa8a849e013a318820ef7bb0257f036..e4df2f06e48ae04a399a701bd36a86044caba83e 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 | 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,16 +154,22 @@ 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
-  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
@@ -292,7 +298,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"
@@ -310,7 +315,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
@@ -429,10 +437,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
@@ -543,7 +552,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