*** empty log message ***

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 97eaacd631877b24f1d237a03bfb6bb5bd93eed3..e9390413bf626a255bbfb9b109f7ced97c615ac0 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -91,13 +91,15 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
 fi
 
 ### Find where to run Emacs.
+### (We don't accept EMACS=t as an answer, since that probably only means
+### that the shell is running in an Emacs window.)
 if [ $update = yes ];
 then
   if [ -f src/emacs ];
   then
     EMACS=`pwd`/src/emacs
   else
-    if [ x$EMACS = x ];
+    if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ];
     then 
       echo You must specify the EMACS environment variable 2>&1
       exit 1
@@ -226,7 +228,16 @@ fi
 
 echo "Making lisp/MANIFEST"
 
-(cd lisp; head -1 [!=]*.el | grep '^;' | sed -e 's/;;; //' > MANIFEST)
+(cd lisp;
+ files=`echo [!=]*.el | sed -e 's/ subdirs.el / /' -e 's/ default.el / /'`
+ for dir in [!=]*; do
+  if [ -d $dir ] && [ $dir != term ] && [ $dir != RCS ]; then
+    echo $dir
+    thisdir=`echo $dir/[!=]*.el | sed -e 's/ subdirs.el / /'`
+    files="$files $thisdir"
+  fi
+ done
+ head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST)
 
 echo "Creating staging directory: \`${tempparent}'"