X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/52d7b2e563b6ea86405963dedf2ba2236d0f6c58..d2956936d3f805740611123d97af64b9e8a01121:/make-dist

diff --git a/make-dist b/make-dist
index a7fcd6ce11..141b6d5e6a 100755
--- a/make-dist
+++ b/make-dist
@@ -62,14 +62,18 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
 fi
 
 ### Find out which version of Emacs this is.
+shortversion=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
+	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
 version=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
-	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'`
+	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if [ ! "${version}" ]; then
-  echo "${progname}: can't find current emacs version in \`./lisp/version.el'." >&2
+  echo "${progname}: can't find current Emacs version in \`./lisp/version.el'." >&2
   exit 1
 fi
 
-if grep -s "GNU Emacs version ${version}" ./man/emacs.texi > /dev/null; then
+echo $version and $shortversion
+
+if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then
   true
 else
   echo "You must update the version number in \`./man/emacs.texi'"
@@ -115,7 +119,16 @@ if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
 fi
 
 ### Update getdate.c.
-(cd lib-src; make -f Makefile.in getdate.c YACC="bison -y")
+(cd lib-src; make -f Makefile getdate.c YACC="bison -y")
+
+echo "Updating Info files."
+
+(cd man; make info)
+
+echo "Updating finder-inf.el."
+
+### update finder-inf.el.
+(cd src; emacs -batch -l finder -f finder-compile-keywords)
 
 echo "Creating staging directory: \`${tempparent}'"
 
@@ -136,9 +149,9 @@ mkdir ${tempdir}
 ### tar file; this means that people can start reading the INSTALL and
 ### 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-ins.in configure configure.in ${tempdir}
-ln make-dist vpath.sed ${tempdir}
+ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README BUGS move-if-change ${tempdir}
+ln ChangeLog Makefile.in configure configure.in ${tempdir}
+ln config.bat make-dist update-subdirs vpath.sed ${tempdir}
 ### Copy these files; they're cross-filesystem symlinks.
 cp config.sub ${tempdir}
 cp config.guess ${tempdir}
@@ -154,11 +167,10 @@ 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 site-lisp \
-	      src src/m src/s src/bitmaps lib-src oldXMenu \
-	      etc lock cpp info man msdos shortnames vms; do
+	      src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
+	      nt nt/inc nt/inc/sys nt/src \
+	      etc etc/e lock cpp info man msdos shortnames vms; do
   mkdir ${tempdir}/${subdir}
 done
 
@@ -170,7 +182,7 @@ echo "Making links to \`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 OChangeLog README dired.todo ../${tempdir}/lisp
+ ln ChangeLog Makefile makefile.nt ChangeLog.? README dired.todo ../${tempdir}/lisp
  cd ../${tempdir}/lisp
  rm -f TAGS =*
  rm -f site-init site-init.el site-init.elc
@@ -195,14 +207,6 @@ echo "Making links to \`lisp/term'."
  ln README ../../${tempdir}/lisp/term
  rm -f =* TAGS)
 
-### echo "Making links to \`external-lisp'."
-### ### Don't distribute =*.el files or TAGS.
-### (cd external-lisp
-###  ln [a-zA-Z]*.el ../${tempdir}/external-lisp
-###  ln [a-zA-Z]*.elc ../${tempdir}/external-lisp
-###  ln ChangeLog README ../${tempdir}/external-lisp
-###  rm -f =* TAGS)
-
 echo "Making links to \`src'."
 ### Don't distribute =*.[ch] files, or the configured versions of
 ### config.h.in, paths.h.in, or Makefile.in.in, or TAGS.
@@ -213,7 +217,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.in ChangeLog OChangeLog config.h.in paths.h.in \
+ ln README Makefile.in.in ChangeLog ChangeLog.? config.h.in paths.h.in \
     ../${tempdir}/src
  ln .gdbinit .dbxinit ../${tempdir}/src
  ln *.opt vms-pp.trans ../${tempdir}/src
@@ -227,25 +231,42 @@ echo "Making links to \`src/bitmaps'."
 
 echo "Making links to \`src/m'."
 (cd src/m
- ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/m)
+ # We call files for miscellaneous input (to linker etc) .inp.
+ ln README [a-zA-Z0-9]*.h *.inp ../../${tempdir}/src/m)
 
 echo "Making links to \`src/s'."
 (cd src/s
- ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s)
+ ln README [a-zA-Z0-9]*.h *.inp ../../${tempdir}/src/s)
 
 echo "Making links to \`lib-src'."
 (cd 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
+ ln ChangeLog Makefile.in.in README testfile vcdiff ../${tempdir}/lib-src
+ ln emacs.csh rcs2log rcs-checkin makefile.nt ../${tempdir}/lib-src
  cd ../${tempdir}/lib-src
  rm -f getdate.tab.c y.tab.c y.tab.h
  rm -f =* TAGS)
 
+echo "Making links to \`nt'."
+(cd nt
+ ln [a-z]*.cmd makefile.* todo ChangeLog install readme ../${tempdir}/nt)
+
+echo "Making links to \`nt/inc'."
+(cd nt/inc
+ ln [a-z]*.h ../${tempdir}/nt/inc)
+
+echo "Making links to \`nt/inc/sys'."
+(cd nt/inc/sys
+ ln [a-z]*.h ../${tempdir}/nt/inc/sys)
+
+echo "Making links to \`nt/src'."
+(cd nt/src
+ ln [a-z]*.h ../${tempdir}/nt/src)
+
 echo "Making links to \`msdos'."
 (cd msdos
  ln  ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
- ln mainmake patch1 sed.in[123] ../${tempdir}/msdos
+ ln mainmake sed*.inp ../${tempdir}/msdos
  cd ../${tempdir}/msdos
  rm -f =*)
 
@@ -255,6 +276,11 @@ echo "Making links to \`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,6 +290,12 @@ echo "Making links to \`etc'."
  rm -f DOC* *~ \#*\# *.dvi *.log *,v =* core
  rm -f TAGS)
 
+echo "Making links to \`etc/e'."
+(cd etc/e
+ ln `ls -d * | grep -v 'RCS' ../${tempdir}/etc/e
+ cd ../${tempdir}/etc
+ rm -f DOC* *~ \#*\# *,v =* core)
+
 echo "Making links to \`cpp'."
 (cd cpp
  ln cccp.c cexp.y Makefile README ../${tempdir}/cpp)
@@ -281,7 +313,7 @@ echo "Making links to \`man'."
 (cd man
  ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
  test -f README && ln README ../${tempdir}/man
- test -f Makefile && ln Makefile ../${tempdir}/man
+ test -f Makefile.in && ln Makefile.in ../${tempdir}/man
  ln ChangeLog split-man ../${tempdir}/man
  cp texinfo.tex texindex.c getopt.c ../${tempdir}/man
  cd ../${tempdir}/man