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.

diff --git a/ChangeLog b/ChangeLog
index f365153c63b8bd9c4c6a7d13c0f88ec2cc52c8da..081240925fa15ee5b17d331dbcf3b25ff195f437 100644 (file)
--- 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 7edb08434780c33c96e9ccf3093113ff87d35b81..f5eb6f32e318761ef369a7858f461dd9aeb17d50 100644 (file)
--- 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)