1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-23 18:47:57 +00:00

Tweaks for make-dist --update.

* make-dist [update]: Let autoreconf figure out what needs updating.
Use `make info-real'.  leim/leim-list.el should always exist.
Check cd return value.
This commit is contained in:
Glenn Morris 2012-07-06 00:40:43 -07:00
parent 7b7ae96547
commit a02d99e754
2 changed files with 17 additions and 22 deletions

View File

@ -1,3 +1,9 @@
2012-07-06 Glenn Morris <rgm@gnu.org>
* make-dist [update]: Let autoreconf figure out what needs updating.
Use `make info-real'. leim/leim-list.el should always exist.
Check cd return value.
2012-07-06 Paul Eggert <eggert@cs.ucla.edu> 2012-07-06 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib. This is for OpenBSD 5.1 amd64. Merge from gnulib. This is for OpenBSD 5.1 amd64.

View File

@ -230,35 +230,24 @@ fi
if [ $update = yes ]; then if [ $update = yes ]; then
## Make sure configure is newer than configure.in. ## Make sure configure is newer than configure.in, etc.
if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then ## It is better to let autoreconf do what is needed than
echo "\`./configure.in' is newer than \`./configure'" >&2 ## for us to try and duplicate all its checks.
echo "Running autoconf" >&2 echo "Running autoreconf"
autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; } autoreconf -i -I m4 || { x=$?; echo Autoreconf FAILED! >&2; exit $x; }
fi
## Make sure src/stamp-h.in is newer than configure.in. ## 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 rm -f src/stamp-h.in
echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2 echo timestamp > src/stamp-h.in
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
echo "Updating Info files" echo "Updating Info files"
(cd doc/emacs; make info) make info-real
(cd doc/misc; make info)
(cd doc/lispref; make info)
(cd doc/lispintro; make info)
echo "Updating finder, custom and autoload data" 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"
echo "Updating leim-list.el" (cd leim && make leim-list.el EMACS="$EMACS")
(cd leim; make leim-list.el EMACS="$EMACS")
fi
echo "Recompiling Lisp files" echo "Recompiling Lisp files"
$EMACS -batch -f batch-byte-recompile-directory lisp leim $EMACS -batch -f batch-byte-recompile-directory lisp leim