X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3f7b30bf00ee4d44a8f891ea31b481d0882f532e..76ac1508785ec7cbd8cc0f8b8679f4d51518810f:/make-dist

diff --git a/make-dist b/make-dist
index 99a586689b..0a516bf173 100755
--- a/make-dist
+++ b/make-dist
@@ -32,23 +32,20 @@ progname="$0"
 ### Print out each line we read, for debugging's sake.
 ### set -v
 
-clean_up=yes
-make_tar=yes
+clean_up=no
+make_tar=no
 newer=""
 
 while [ $# -gt 0 ]; do
   case "$1" in
-    ## This option tells make-dist not to delete the staging directory
-    ## after it's done making the tar file.
-    "--no-clean-up" )
-      clean_up=no
+    ## This option tells make-dist to delete the staging directory
+    ## when done.  It is useless to use this unless you make a tar file.
+    "--clean-up" )
+      clean_up=yes
     ;;
-    ## This option tells make-dist not to make a tar file.  Since it's 
-    ## rather pointless to build the whole staging directory and then
-    ## nuke it, using this option also selects '--no-clean-up'.
-    "--no-tar" )
-      make_tar=no
-      clean_up=no
+    ## This option tells make-dist to make a tar file.
+    "--tar" )
+      make_tar=yes
     ;;
     ## This option tells make-dist to make the distribution normally, then
     ## remove all files older than the given timestamp file.  This is useful
@@ -129,11 +126,18 @@ if [ "${bogosities}" != "" ]; then
 fi
 rm -f /tmp/el /tmp/elc
 
+### Check for .el files that would overflow the 14-char limit if compiled.
+long=`find lisp -name '???????????*.el' -print`
+if [ "$long" != "" ]; then
+  echo "The following .el file names are too long:"
+  echo "$long"
+fi
+
 ### Make sure configure is newer than configure.in.
 if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
   echo "\`./configure.in' is newer than \`./configure'" >&2
   echo "Running autoconf" >&2
-  autoconf
+  autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; }
 fi
 
 ### Update getdate.c.
@@ -157,7 +161,7 @@ src/emacs -batch -f batch-update-autoloads lisp
 
 echo "Making lisp/MANIFEST"
 
-(cd lisp; head -1 *.el | grep '^;' | sed -e 's/;;; //' > MANIFEST)
+(cd lisp; head -1 [!=]*.el | grep '^;' | sed -e 's/;;; //' > MANIFEST)
 
 echo "Creating staging directory: \`${tempparent}'"
 
@@ -199,7 +203,7 @@ echo "Updating version number in README"
 echo "Creating subdirectories"
 for subdir in lisp lisp/term site-lisp \
 	      src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
-	      nt nt/inc nt/inc/sys \
+	      nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet \
 	      etc etc/e lock cpp info man msdos vms; do
   mkdir ${tempdir}/${subdir}
 done
@@ -282,7 +286,7 @@ echo "Making links to \`lib-src'"
 
 echo "Making links to \`nt'"
 (cd nt
- ln emacs.ico emacs.rc config.nt config.w95 [a-z]*.in [a-z]*.c ../${tempdir}/nt
+ ln emacs.ico emacs.rc config.nt [a-z]*.in [a-z]*.c ../${tempdir}/nt
  ln [a-z]*.bat [a-z]*.h makefile.def makefile.nt ../${tempdir}/nt
  ln TODO ChangeLog INSTALL README ../${tempdir}/nt)
 
@@ -294,10 +298,18 @@ echo "Making links to \`nt/inc/sys'"
 (cd nt/inc/sys
  ln [a-z]*.h ../../../${tempdir}/nt/inc/sys)
 
+echo "Making links to \`nt/inc/arpa'"
+(cd nt/inc/arpa
+ ln [a-z]*.h ../../../${tempdir}/nt/inc/arpa)
+
+echo "Making links to \`nt/inc/netinet'"
+(cd nt/inc/netinet
+ ln [a-z]*.h ../../../${tempdir}/nt/inc/netinet)
+
 echo "Making links to \`msdos'"
 (cd msdos
  ln  ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
- ln mainmake sed*.inp ../${tempdir}/msdos
+ ln mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos
  cd ../${tempdir}/msdos
  rm -f =*)