(ad-make-single-advice-docstring): Treat case with no doctring specially.

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index 97eaacd631877b24f1d237a03bfb6bb5bd93eed3..3c57500e300cadc5b617c7913d932803f22cd11d 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -91,13 +91,16 @@ 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
+  unset EMACS_UNIBYTE
   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
@@ -209,15 +212,15 @@ if [ $update = yes ];
 then
   echo "Updating Info files"
 
-  (cd man; make info)
+  (cd man; make -f Makefile.in srcdir=. info)
 
   echo "Updating finder, custom and autoload data"
 
-  (cd lisp; make updates EMACS=$EMACS)
+  (cd lisp; make updates EMACS="$EMACS")
 
   echo "Updating leim-list.el"
 
-  (cd leim; make leim-list.el EMACS=$EMACS)
+  (cd leim; make leim-list.el EMACS="$EMACS")
 
   echo "Recompiling Lisp files"
 
@@ -226,7 +229,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}'"
 
@@ -269,7 +281,7 @@ echo "Creating subdirectories"
 for subdir in lisp site-lisp leim real-leim real-leim/CXTERM-DIC \
              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 \
+             nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
              etc etc/e lock info man msdos vms; do
   mkdir ${tempdir}/${subdir}
 done
@@ -315,6 +327,9 @@ echo "Making links to \`lisp' and its subdirectories"
    if [ -f $file/README ]; then
      ln $file/README ../${tempdir}/lisp/$file
    fi
+   if [ -f $file/ChangeLog ]; then
+     ln $file/ChangeLog ../${tempdir}/lisp/$file
+   fi
  done )
 
 echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
@@ -430,6 +445,10 @@ echo "Making links to \`nt/inc/netinet'"
 (cd nt/inc/netinet
  ln [a-z]*.h ../../../${tempdir}/nt/inc/netinet)
 
+echo "Making links to \`nt/icons'"
+(cd nt/icons
+ ln [a-z]*.ico ../../${tempdir}/nt/icons)
+
 echo "Making links to \`msdos'"
 (cd msdos
  ln  ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
@@ -473,6 +492,7 @@ echo "Making links to \`etc'"
    fi
  done
  cd ../${tempdir}/etc
+ rm -f fns*.el
  rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
  rm -f TAGS)