X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6028d553ed9760f0b8566a5765291f8a036d8cfd..879dea9384f9c2a13d4c379088848a5b321d2af6:/make-dist

diff --git a/make-dist b/make-dist
index e4a9ccadec..ce384fd88c 100755
--- a/make-dist
+++ b/make-dist
@@ -57,7 +57,7 @@ done
 if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
   echo "${progname}: Can't find \`src/lisp.h' and \`lisp/version.el'." >&2
   echo "${progname} must be run in the top directory of the Emacs" >&2
-  echo "distribution tree.  Cd to that directory and try again." >&2
+  echo "distribution tree.  cd to that directory and try again." >&2
   exit 1
 fi
 
@@ -99,7 +99,7 @@ rm -f /tmp/el /tmp/elc
 
 ### Make sure configure is newer than configure.in.
 if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
-  echo "`./configure.in' seems to be newer than `./configure.'" >&2
+  echo "\`./configure.in' seems to be newer than \`./configure.'" >&2
   echo "Attempting to run autoconf." >&2
   autoconf
 fi
@@ -128,7 +128,7 @@ mkdir ${tempdir}
 echo "Making links to top-level files." 
 ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README move-if-change ${tempdir}
 ln ChangeLog Makefile.in build-install.in configure configure.in ${tempdir}
-ln make-dist ${tempdir}
+ln make-dist vpath.sed ${tempdir}
 ### Copy config.guess and config.sub; they're cross-filesystem symlinks.
 cp config.sub ${tempdir}
 cp config.guess ${tempdir}
@@ -145,7 +145,7 @@ echo "Updating version number in README."
 echo "Creating subdirectories."
 # I think we're not going to distribute anything in external-lisp, so
 # I've removed it from this list.
-for subdir in lisp lisp/term lisp/forms-mode site-lisp \
+for subdir in lisp lisp/term site-lisp \
 	      src src/m src/s src/bitmaps lib-src oldXMenu \
 	      etc lock cpp info man shortnames vms; do
   mkdir ${tempdir}/${subdir}
@@ -156,9 +156,10 @@ echo "Making links to \`lisp'."
 (cd lisp
  ln [a-zA-Z]*.el ../${tempdir}/lisp
  ln [a-zA-Z]*.elc ../${tempdir}/lisp
+ ln [a-zA-Z]*.dat forms.README ../${tempdir}/lisp
  ## simula.el doesn't keep abbreviations in simula.defns any more.
  ## ln [a-zA-Z]*.defns ../${tempdir}/lisp
- ln ChangeLog README ../${tempdir}/lisp
+ ln ChangeLog OChangeLog README dired.todo ../${tempdir}/lisp
  cd ../${tempdir}/lisp
  rm -f TAGS =*
  rm -f site-init site-init.el site-init.elc
@@ -180,14 +181,7 @@ echo "Making links to \`lisp/term'."
 (cd lisp/term
  ln [a-zA-Z]*.el ../../${tempdir}/lisp/term
  ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term
- ln README ChangeLog ../../${tempdir}/lisp/term
- rm -f =* TAGS)
-
-echo "Making links to \`lisp/forms-mode'."
-(cd lisp/forms-mode
- ln [a-zA-Z]*.el ../../${tempdir}/lisp/forms-mode
- ln [a-zA-Z]*.elc ../../${tempdir}/lisp/forms-mode
- ln forms.README forms-d2.dat ../../${tempdir}/lisp/forms-mode
+ ln README ../../${tempdir}/lisp/term
  rm -f =* TAGS)
 
 ### echo "Making links to \`external-lisp'."
@@ -200,7 +194,7 @@ echo "Making links to \`lisp/forms-mode'."
 
 echo "Making links to \`src'."
 ### Don't distribute =*.[ch] files, or the configured versions of
-### config.h.in, paths.h.in, or Makefile.in, or TAGS.
+### config.h.in, paths.h.in, or Makefile.in.in, or TAGS.
 (cd src
  echo "  (If we can't link gmalloc.c, that's okay.)"
  ln [a-zA-Z]*.c ../${tempdir}/src
@@ -208,7 +202,7 @@ echo "Making links to \`src'."
  test -f ../${tempdir}/src/gmalloc.c || cp gmalloc.c ../${tempdir}/src
  ln [a-zA-Z]*.h ../${tempdir}/src
  ln [a-zA-Z]*.s ../${tempdir}/src
- ln README Makefile.in ymakefile ChangeLog config.h.in paths.h.in \
+ ln README Makefile.in.in ChangeLog OChangeLog config.h.in paths.h.in \
     ../${tempdir}/src
  ln .gdbinit .dbxinit ../${tempdir}/src
  ln *.opt vms-pp.trans ../${tempdir}/src
@@ -237,7 +231,7 @@ echo "Making links to \`lib-src'."
  ln ChangeLog Makefile.in README testfile vcdiff rcs2log ../${tempdir}/lib-src
  ln emacs.csh rcs-checkin ../${tempdir}/lib-src
  cd ../${tempdir}/lib-src
- rm -f getdate.c getdate.tab.c y.tab.c y.tab.h
+ rm -f getdate.tab.c y.tab.c y.tab.h
  rm -f =* TAGS)
 
 echo "Making links to \`oldXMenu'."
@@ -336,7 +330,7 @@ if [ "${make_tar}" = yes ]; then
   fi
   case "${default_gzip}" in
     compress* ) gzip_extension=.Z ;;
-    * )         gzip_extension=.z ;;
+    * )         gzip_extension=.gz ;;
   esac
   echo "Creating tar file."
   (cd ${tempparent} ; tar cvf - ${emacsname} ) \