X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6e20ffab4d54d6d0058e86a6c5e0f342cd93c560..791587eebf6d9bd552262845aaa191b8523e5ac9:/make-dist

diff --git a/make-dist b/make-dist
index 8bf834c0db..345ae7cda9 100755
--- a/make-dist
+++ b/make-dist
@@ -76,6 +76,16 @@ else
   sleep 5
 fi
 
+### Make sure we don't already have a directory  emacs-${version}.
+
+emacsname="emacs-${version}${new_extension}"
+
+if [ -d ${emacsname} ]
+then
+  echo Directory "${emacsname}" already exists >&2
+  exit 1
+fi
+
 ### Make sure the subdirectory is available.
 tempparent="make-dist.tmp.$$"
 if [ -d ${tempparent} ]; then
@@ -99,17 +109,17 @@ 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
 
 ### Update getdate.c.
-(cd lib-src; make -f Makefile.in getdate.c)
+(cd lib-src; make -f Makefile.in getdate.c YACC="bison -y")
 
 echo "Creating staging directory: \`${tempparent}'"
+
 mkdir ${tempparent}
-emacsname="emacs-${version}${new_extension}"
 tempdir="${tempparent}/${emacsname}"
 
 ### This trap ensures that the staging directory will be cleaned up even
@@ -127,11 +137,12 @@ mkdir ${tempdir}
 ### README while the rest of the tar file is still unpacking.  Whoopee.
 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}
-### Copy config.guess and config.sub; they're cross-filesystem symlinks.
+ln ChangeLog Makefile.in build-ins.in configure configure.in ${tempdir}
+ln make-dist vpath.sed ${tempdir}
+### Copy these files; they're cross-filesystem symlinks.
 cp config.sub ${tempdir}
 cp config.guess ${tempdir}
+cp install.sh ${tempdir}
 
 echo "Updating version number in README."
 (cd ${tempdir}
@@ -146,8 +157,8 @@ 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 site-lisp \
-	      src src/m src/s src/bitmaps lib-src oldXMenu \
-	      etc lock cpp info man shortnames vms; do
+	      src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
+	      etc lock cpp info man msdos shortnames vms; do
   mkdir ${tempdir}/${subdir}
 done
 
@@ -156,10 +167,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
+ ln [a-zA-Z]*.dat ../${tempdir}/lisp
  ## simula.el doesn't keep abbreviations in simula.defns any more.
  ## ln [a-zA-Z]*.defns ../${tempdir}/lisp
- ln ChangeLog README dired.todo ../${tempdir}/lisp
+ ln ChangeLog ChangeLog.? README dired.todo ../${tempdir}/lisp
  cd ../${tempdir}/lisp
  rm -f TAGS =*
  rm -f site-init site-init.el site-init.elc
@@ -194,7 +205,7 @@ echo "Making links to \`lisp/term'."
 
 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
@@ -202,15 +213,12 @@ 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 ChangeLog.? config.h.in paths.h.in \
     ../${tempdir}/src
- ln .gdbinit .dbxinit gnu-hp300 ../${tempdir}/src
+ ln .gdbinit .dbxinit ../${tempdir}/src
  ln *.opt vms-pp.trans ../${tempdir}/src
  cd ../${tempdir}/src
  rm -f config.h paths.h Makefile
- if [ -z "${newer}" ]; then
-   etags *.h *.c ../lisp/*.el
- fi
  rm -f =* TAGS)
 
 echo "Making links to \`src/bitmaps'."
@@ -231,15 +239,27 @@ 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 \`msdos'."
+(cd msdos
+ ln  ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
+ ln mainmake sed[123].inp ../${tempdir}/msdos
+ cd ../${tempdir}/msdos
+ rm -f =*)
+
 echo "Making links to \`oldXMenu'."
 (cd oldXMenu
  ln *.c *.h *.in ../${tempdir}/oldXMenu
  ln README Imakefile ChangeLog ../${tempdir}/oldXMenu
  ln compile.com descrip.mms ../${tempdir}/oldXMenu)
 
+echo "Making links to \`lwlib'."
+(cd lwlib
+ ln *.c *.h *.in ../${tempdir}/lwlib
+ ln README Imakefile ChangeLog ../${tempdir}/lwlib)
+
 echo "Making links to \`etc'."
 ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
 ### tex litter.
@@ -264,11 +284,11 @@ echo "Making links to \`info'."
 
 echo "Making links to \`man'."
 (cd man
- ln *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
+ ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
  test -f README && ln README ../${tempdir}/man
  test -f Makefile && ln Makefile ../${tempdir}/man
  ln ChangeLog split-man ../${tempdir}/man
- cp texinfo.tex texindex.c ../${tempdir}/man
+ cp texinfo.tex texindex.c getopt.c ../${tempdir}/man
  cd ../${tempdir}/man
  rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
  rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
@@ -289,9 +309,7 @@ echo "Making links to \`vms'."
 echo "Making sure copying notices are all copies of \`etc/COPYING'."
 rm -f ${tempdir}/etc/COPYING
 cp etc/COPYING ${tempdir}/etc/COPYING
-# I think we're not going to distribute anything in external-lisp, so
-# I've removed it from this list.
-for subdir in lisp src lib-src info shortnames; do
+for subdir in lisp src lib-src info shortnames msdos; do
   if [ -f ${tempdir}/${subdir}/COPYING ]; then
     rm ${tempdir}/${subdir}/COPYING
   fi
@@ -304,7 +322,7 @@ done
 #### than two.
 echo "Breaking intra-tree links."
 find ${tempdir} ! -type d -links +2 \
-  -exec cp {} $$ \; -exec rm -f {} \; -exec mv $$ {} \;
+  -exec cp -p {} $$ \; -exec rm -f {} \; -exec mv $$ {} \;
 
 if [ "${newer}" ]; then
   echo "Removing files older than $newer."
@@ -341,6 +359,9 @@ fi
 if [ "${clean_up}" = yes ]; then
   echo "Cleaning up the staging directory."
   rm -rf ${tempparent}
+else
+  (cd ${tempparent}; mv ${emacsname} ..)
+  rm -rf ${tempparent}
 fi
 
 ### make-dist ends here