* Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d6260f6..c0f40b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2012-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,
+       to avoid problems with recursion when using GNU make.
+
+2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.in (bootstrap): Simplify build procedure.
+       Suggested by Wolfgang Jenker in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
+
+       Merge from gnulib, incorporating:
+       2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
+
+2012-09-19  Tassilo Horn  <tsdh@gnu.org>
+
+       * doc/emacs/misc.texi (DocView Slicing): Document new slice from
+       BoundingBox feature.
+
+2012-09-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
+
 2012-09-17  Andreas Schwab  <schwab@linux-m68k.org>
 
        * Makefile.in (bootstrap): Revert last change.  Run config.status