X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/666b903b912ca0aa2b1a034859b752b04f03141a..0699fc18a5ea00b9a6d64b0e0ebf33b4723beb10:/make-dist?ds=inline

diff --git a/make-dist b/make-dist
index 9cf6af09e4..b157d9a54d 100755
--- a/make-dist
+++ b/make-dist
@@ -147,7 +147,7 @@ fi
 
 ### Find out which version of Emacs this is.
 version=`
-  sed -n 's/^AC_INIT(emacs,[	 ]*\([^	 )]*\).*/\1/p' <configure.in
+  sed -n 's/^AC_INIT(emacs,[	 ]*\([^	 )]*\).*/\1/p' <configure.ac
 ` || version=
 if [ ! "${version}" ]; then
   echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
@@ -230,35 +230,24 @@ fi
 
 if [ $update = yes ]; then
 
-  ## Make sure configure is newer than configure.in.
-  if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then
-    echo "\`./configure.in' is newer than \`./configure'" >&2
-    echo "Running autoconf" >&2
-    autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; }
-  fi
+  ## Make sure configure is newer than configure.ac, etc.
+  ## It is better to let autoreconf do what is needed than
+  ## for us to try and duplicate all its checks.
+  echo "Running autoreconf"
+  autoreconf -i -I m4 || { x=$?; echo Autoreconf FAILED! >&2; exit $x; }
 
-  ## Make sure src/stamp-h.in is newer than configure.in.
-  if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then
-    echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2
-    echo "Running autoheader" >&2
-    autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; }
-    rm -f src/stamp-h.in
-    echo timestamp > src/stamp-h.in
-  fi
+  ## Make sure src/stamp-h.in is newer than configure.ac.
+  rm -f src/stamp-h.in
+  echo timestamp > src/stamp-h.in
 
   echo "Updating Info files"
-  (cd doc/emacs; make info)
-  (cd doc/misc; make info)
-  (cd doc/lispref; make info)
-  (cd doc/lispintro; make info)
+  make info-real
 
   echo "Updating finder, custom and autoload data"
-  (cd lisp; make updates EMACS="$EMACS")
+  (cd lisp && make updates EMACS="$EMACS")
 
-  if test -f leim/leim-list.el; then
-    echo "Updating leim-list.el"
-    (cd leim; make leim-list.el EMACS="$EMACS")
-  fi
+  echo "Updating leim-list.el"
+  (cd leim && make leim-list.el EMACS="$EMACS")
 
   echo "Recompiling Lisp files"
   $EMACS -batch -f batch-byte-recompile-directory lisp leim
@@ -284,8 +273,8 @@ mkdir ${tempdir}
 ### README while the rest of the tar file is still unpacking.  Whoopee.
 echo "Making links to top-level files"
 ln INSTALL README BUGS ${tempdir}
-ln ChangeLog Makefile.in configure configure.in ${tempdir}
-ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
+ln ChangeLog Makefile.in configure configure.ac ${tempdir}
+ln config.bat make-dist .dir-locals.el ${tempdir}
 ln aclocal.m4 ${tempdir}
 
 echo "Creating subdirectories"
@@ -293,7 +282,7 @@ for subdir in site-lisp \
 	      leim leim/CXTERM-DIC leim/MISC-DIC \
 	      leim/SKK-DIC leim/ja-dic leim/quail \
 	      build-aux build-aux/snippet \
-	      src src/m src/s src/bitmaps lib lib-src oldXMenu lwlib \
+	      src src/bitmaps lib lib-src oldXMenu lwlib \
 	      nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
 	      `find etc lisp admin -type d` \
 	      doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
@@ -346,7 +335,7 @@ echo "Making links to \`leim' and its subdirectories"
 echo "Making links to \`build-aux'"
 (cd build-aux
  ln compile config.guess config.sub depcomp ../${tempdir}/build-aux
- ln install-sh missing move-if-change ../${tempdir}/build-aux)
+ ln install-sh missing move-if-change update-subdirs ../${tempdir}/build-aux)
 
 echo "Making links to \`build-aux/snippet'"
 (cd build-aux/snippet
@@ -370,14 +359,6 @@ echo "Making links to \`src/bitmaps'"
 (cd src/bitmaps
  ln README *.xbm ../../${tempdir}/src/bitmaps)
 
-echo "Making links to \`src/m'"
-(cd src/m
- ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/m)
-
-echo "Making links to \`src/s'"
-(cd src/s
- ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s)
-
 echo "Making links to \`lib'"
 (snippet_h=`(cd build-aux/snippet && ls *.h)`
  cd lib
@@ -390,8 +371,8 @@ echo "Making links to \`lib'"
 echo "Making links to \`lib-src'"
 (cd lib-src
  ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
- ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
- ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src
+ ln ChangeLog Makefile.in README testfile ../${tempdir}/lib-src
+ ln grep-changelog rcs2log ../${tempdir}/lib-src
  ln makefile.w32-in ../${tempdir}/lib-src)
 
 echo "Making links to \`m4'"