# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295481592 28800
# Node ID b14f98859016e1f6d474bc71bc1bad4d9177b48b
# Parent  4d90cea362a318d5a6e8158964a32136993907be# Parent  bc91751b1f8a3dacb92e2dc34909b96d83cf8cda
Merge: build from gnulib a bit better; document autoreconf.

diff -r 4d90cea362a3 -r b14f98859016 ChangeLog
--- a/ChangeLog	Wed Jan 19 15:32:42 2011 -0800
+++ b/ChangeLog	Wed Jan 19 15:59:52 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'
diff -r 4d90cea362a3 -r b14f98859016 Makefile.in
--- a/Makefile.in	Wed Jan 19 15:32:42 2011 -0800
+++ b/Makefile.in	Wed Jan 19 15:59:52 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)
diff -r 4d90cea362a3 -r b14f98859016 admin/ChangeLog
--- a/admin/ChangeLog	Wed Jan 19 15:32:42 2011 -0800
+++ b/admin/ChangeLog	Wed Jan 19 15:59:52 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.
diff -r 4d90cea362a3 -r b14f98859016 admin/make-tarball.txt
--- a/admin/make-tarball.txt	Wed Jan 19 15:32:42 2011 -0800
+++ b/admin/make-tarball.txt	Wed Jan 19 15:59:52 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.
-