# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295641471 28800
# Node ID c729a73f3e52648a5dbef5747116eff562318711
# Parent  0bfcbd0b704ba4b8565377d839f68c1d4aea362d# Parent  51005885fe3954c50f345c3276ede5cde4608d4c
Merge: aclocal.m4: tweaks to regenerate more conveniently

diff -r 0bfcbd0b704b -r c729a73f3e52 .bzrignore
--- a/.bzrignore	Fri Jan 21 12:38:33 2011 -0500
+++ b/.bzrignore	Fri Jan 21 12:24:31 2011 -0800
@@ -13,6 +13,7 @@
 *.dSYM
 *.elc
 *.exe
+aclocal.m4
 autom4te.cache
 confdefs.h
 configure.lineno
diff -r 0bfcbd0b704b -r c729a73f3e52 ChangeLog
--- a/ChangeLog	Fri Jan 21 12:38:33 2011 -0500
+++ b/ChangeLog	Fri Jan 21 12:24:31 2011 -0800
@@ -1,3 +1,11 @@
+2011-01-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	aclocal.m4: tweaks to regenerate more conveniently
+	This attempts to act better when the source is in a weird state.  See
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>.
+	* Makefile.in (am--refresh): Add aclocal.m4, configure, config.in.
+	* .bzrignore: Add aclocal.m4.
+
 2011-01-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	aclocal.m4: omit auto-generated file from repository
diff -r 0bfcbd0b704b -r c729a73f3e52 Makefile.in
--- a/Makefile.in	Fri Jan 21 12:38:33 2011 -0500
+++ b/Makefile.in	Fri Jan 21 12:24:31 2011 -0800
@@ -260,7 +260,7 @@
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution.
 # leim is not included because it needs special handling.
-# 
+#
 # Actually, we now include `lisp' as well, since the compiled files
 # are not included any more in case of bootstrap or in case Emacs was
 # checked out from a VCS.
@@ -414,7 +414,7 @@
 AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am
 $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
 	cd $(srcdir) && automake --gnu -a -c lib/Makefile
-am--refresh:
+am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in
 .PHONY: am--refresh
 
 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@@ -863,7 +863,7 @@
 
 .PHONY: info dvi dist check html
 
-info-real: 
+info-real:
 	(cd doc/emacs; $(MAKE) $(MFLAGS) info)
 	(cd doc/misc; $(MAKE) $(MFLAGS) info)
 	(cd doc/lispref; $(MAKE) $(MFLAGS) info)