Mercurial > emacs
changeset 112378:bc91751b1f8a
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 19 Jan 2011 15:58:00 -0800 |
| parents | 5855bdef20c9 (diff) 4d90cea362a3 (current diff) |
| children | b14f98859016 75fec4affb13 |
| files | |
| diffstat | 4 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jan 19 15:32:42 2011 -0800 +++ b/ChangeLog Wed Jan 19 15:58:00 2011 -0800 @@ -1,3 +1,10 @@ +2011-01-19 Paul Eggert <eggert@cs.ucla.edu> + + Minor Makefile.in tweaks to build from gnulib better. + <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html> + * Makefile.in (sync-from-gnulib): Also run autoreconf -I m4. + (top_maintainer_clean): Don't remove aclocal.m4. + 2011-01-18 Paul Eggert <eggert@cs.ucla.edu> Minor cleanups for 'bzr status'
--- a/Makefile.in Wed Jan 19 15:32:42 2011 -0800 +++ b/Makefile.in Wed Jan 19 15:58:00 2011 -0800 @@ -343,6 +343,7 @@ $(gnulib_srcdir)/build-aux/mkinstalldirs \ $(gnulib_srcdir)/build-aux/move-if-change \ $(srcdir) + cd $(srcdir) && autoreconf -I m4 .PHONY: sync-from-gnulib # These targets should be "${SUBDIR} without `src'". @@ -832,8 +833,7 @@ ### begin to build the program. top_maintainer_clean=\ ${top_distclean}; \ - rm -fr autom4te.cache; \ - rm -f aclocal.m4 + rm -fr autom4te.cache maintainer-clean: bootstrap-clean FRC (cd src; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
--- a/admin/ChangeLog Wed Jan 19 15:32:42 2011 -0800 +++ b/admin/ChangeLog Wed Jan 19 15:58:00 2011 -0800 @@ -1,3 +1,9 @@ +2011-01-19 Paul Eggert <eggert@cs.ucla.edu> + + * make-tarball.txt: Suggest 'autoreconf -I m4 --force' + rather than doing rm and autoconf by hand. See + <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00673.html>. + 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> * notes/bzr (Installing changes from gnulib): New section.
--- a/admin/make-tarball.txt Wed Jan 19 15:32:42 2011 -0800 +++ b/admin/make-tarball.txt Wed Jan 19 15:58:00 2011 -0800 @@ -28,7 +28,7 @@ refer to a newer release of Emacs. (This is probably needed only when preparing a major Emacs release, or branching for it.) -5. rm configure src/config.in; autoconf; autoheader +5. autoreconf -I m4 --force make bootstrap 6. Commit configure, src/config.in, etc/AUTHORS, all the files changed @@ -107,4 +107,3 @@ 13. For a pretest, announce it on emacs-devel and BCC the pretesters. For a release, announce it on info-gnu@gnu.org, info-gnu-emacs@gnu.org, and emacs-devel. -