Use frame-width instead of screen-width.

[bpt/emacs.git] / make-dist

diff --git a/make-dist b/make-dist
index 17ce892..8796f0b 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -36,7 +36,8 @@ while [ $# -gt 0 ]; do
     # remove all files newer than the given timestamp file.  This is useful
     # for creating incremental or patch distributions
     "--newer")
-      newer=$2
+      newer="$2"
+      new_extension=".new"
       shift
     ;;
     * )
@@ -57,7 +58,7 @@ fi
 
 # Find out which version of Emacs this is.
 version=`grep 'defconst[        ]*emacs-version' lisp/version.el \
-        | sed -e 's/^.*"\([0-9]+\.[0-9]+\)\..*$/\1/'`
+        | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'`
 if [ ! "${version}" ]; then
   echo "${progname}: can't find current emacs version in \`./lisp/version.el'." >&2
   exit 1
@@ -76,7 +77,7 @@ fi
 
 echo "Creating staging directory: \`${tempparent}'"
 mkdir ${tempparent}
-emacsname="emacs-${version}"
+emacsname="emacs-${version}${new_extension}"
 tempdir="${tempparent}/${emacsname}"
 
 # This trap ensures that the staging directory will be cleaned up even
@@ -104,7 +105,7 @@ for subdir in lisp lisp/term local-lisp external-lisp \
 done
 
 echo "Making links to \`lisp'."
-# Don't distribute =*.el files, site-init.el, or site-load.el.
+# Don't distribute =*.el files, site-init.el, site-load.el, or default.el.
 (cd lisp
  ln [a-zA-Z]*.el ../${tempdir}/lisp
  ln [a-zA-Z]*.elc ../${tempdir}/lisp
@@ -113,7 +114,8 @@ echo "Making links to \`lisp'."
  ln ChangeLog README ../${tempdir}/lisp
  cd ../${tempdir}/lisp
  rm -f site-init site-init.el site-init.elc
- rm -f site-load site-load.el site-load.elc)
+ rm -f site-load site-load.el site-load.elc
+ rm -f default default.el default.elc)
 
 echo "Making links to \`lisp/term'."
 # Don't distribute =*.el files.
@@ -141,7 +143,10 @@ echo "Making links to \`src'."
  ln .gdbinit .dbxinit ../${tempdir}/src
  ln *.com *.opt vms-pp.trans vmsbuild ../${tempdir}/src
  cd ../${tempdir}/src
- rm -f config.h paths.h Makefile)
+ rm -f config.h paths.h Makefile
+ if [ -z "${newer}" ]; then
+   etags *.h *.c ../lisp/*.el
+ fi)
 
 echo "Making links to \`src/m'."
 (cd src/m
@@ -164,7 +169,7 @@ echo "Making links to \`oldXMenu'."
  ln README Makefile Imakefile ChangeLog ../${tempdir}/oldXMenu)
 
 echo "Making links to \`etc'."
-# Don't distribute TAGS, DOC files, backups, autosaves, or tex litter.
+# Don't distribute DOC files, backups, autosaves, or tex litter.
 (cd etc
  ln [0-9a-zA-Z]* ../${tempdir}/etc
  cd ../${tempdir}/etc
@@ -172,7 +177,7 @@ echo "Making links to \`etc'."
  for dummy in DOC-dummy dummy~ \#dummy\# dummy.dvi dummy.log; do
    ln MACHINES ${dummy}
  done
- rm -f TAGS DOC* *~ \#*\# *.dvi *.log core)
+ rm -f DOC* *~ \#*\# *.dvi *.log core)
 
 # For now, we comment these out, since I'm not changing them any.
 #!! echo "Making links to \`cpp'."