diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-19 15:56:53 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-19 15:56:53 -0800 |
| commit | 0813c96eb2f6af9d6a392243b0d669d38467f23c (patch) | |
| tree | 331e3b096b2fdf13ce71177f2c6f5203274c348f | |
| parent | d6100f3de6610760d9db8c2ef61ff63a1c7c15f5 (diff) | |
| download | emacs-0813c96eb2f6af9d6a392243b0d669d38467f23c.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f365153c63b..081240925fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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' diff --git a/Makefile.in b/Makefile.in index 7edb0843478..f5eb6f32e31 100644 --- a/Makefile.in +++ b/Makefile.in @@ -343,6 +343,7 @@ sync-from-gnulib: $(gnulib_srcdir) $(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 @@ bootstrap-clean: FRC ### 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) |