X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f753e9aa9233cffe70cc7fde602b6078a1433d08..c901003d61adb7bd8446782f9fa8c510c162dbae:/make-dist

diff --git a/make-dist b/make-dist
index d1b59c98d2..466d97f264 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
 
@@ -73,7 +73,7 @@ if grep -s "GNU Emacs version ${version}" ./man/emacs.texi > /dev/null; then
   true
 else
   echo "You must update the version number in \`./man/emacs.texi'"
-  exit 1
+  sleep 5
 fi
 
 ### Make sure the subdirectory is available.
@@ -87,6 +87,26 @@ them, and try again." >&2
   exit 1
 fi
 
+### Check for .elc files with no corresponding .el file.
+ls -1 lisp/*.el | sed 's/\.el$/.elc/' > /tmp/el
+ls -1 lisp/*.elc > /tmp/elc
+bogosities="`comm -13 /tmp/el /tmp/elc`"
+if [ "${bogosities}" != "" ]; then
+  echo "The following .elc files have no corresponding .el files:"
+  echo "${bogosities}"
+fi
+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 "Attempting to run autoconf." >&2
+  autoconf
+fi
+
+### Update getdate.c.
+(cd lib-src; make -f Makefile.in getdate.c)
+
 echo "Creating staging directory: \`${tempparent}'"
 mkdir ${tempparent}
 emacsname="emacs-${version}${new_extension}"
@@ -109,8 +129,9 @@ 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.sub; it's a cross-filesystem symlink.
+### Copy config.guess and config.sub; they're cross-filesystem symlinks.
 cp config.sub ${tempdir}
+cp config.guess ${tempdir}
 
 echo "Updating version number in README."
 (cd ${tempdir}
@@ -124,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 local-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}
@@ -135,6 +156,7 @@ 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
@@ -159,7 +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
+ ln README ../../${tempdir}/lisp/term
  rm -f =* TAGS)
 
 ### echo "Making links to \`external-lisp'."
@@ -182,7 +204,7 @@ echo "Making links to \`src'."
  ln [a-zA-Z]*.s ../${tempdir}/src
  ln README Makefile.in ymakefile ChangeLog config.h.in paths.h.in \
     ../${tempdir}/src
- ln .gdbinit .dbxinit ../${tempdir}/src
+ ln .gdbinit .dbxinit gnu-hp300 ../${tempdir}/src
  ln *.opt vms-pp.trans ../${tempdir}/src
  cd ../${tempdir}/src
  rm -f config.h paths.h Makefile
@@ -205,7 +227,7 @@ echo "Making links to \`src/s'."
 
 echo "Making links to \`lib-src'."
 (cd lib-src
- ln [a-zA-Z]*.[chy] [a-zA-Z]*.lex [a-zA-Z]*.com ../${tempdir}/lib-src
+ ln [a-zA-Z]*.[chy] [a-zA-Z]*.lex ../${tempdir}/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
@@ -242,8 +264,7 @@ echo "Making links to \`info'."
 
 echo "Making links to \`man'."
 (cd man
- ln *.tex *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
- ln *.c ../${tempdir}/man
+ ln *.texinfo *.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
@@ -277,6 +298,14 @@ for subdir in lisp src lib-src info shortnames; do
   cp etc/COPYING ${tempdir}/${subdir}
 done
 
+#### Make sure that there aren't any hard links between files in the
+#### distribution; people with afs can't deal with that.  Okay,
+#### actually we just re-copy anything with a link count greater
+#### than two.
+echo "Breaking intra-tree links."
+find ${tempdir} ! -type d -links +2 \
+  -exec cp {} $$ \; -exec rm -f {} \; -exec mv $$ {} \;
+
 if [ "${newer}" ]; then
   echo "Removing files older than $newer."
   ## We remove .elc files unconditionally, on the theory that anyone picking
@@ -301,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} ) \