Make merging from gnulib a script, not a makefile action.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 7e98201..f95549d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Make merging from gnulib a script, not a makefile action.
+       Putting it in a makefile has some problems with reflection, as
+       merging from gnulib updates 'configure', which can update the makefile.
+       Putting it in a standalone script breaks this loop.
+       * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
+       (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
+       Remove, moving the actions to the script admin/merge-gnulib.
+
+2012-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (install-arch-indep, install-doc, install-info)
+       (uninstall): Scrap superfluous subshells.
+
+2012-05-19  Ulrich Mueller  <ulm@gentoo.org>
+
+       * Makefile.in (install-etc): Respect DESTDIR.  (Bug#11518)
+
 2012-05-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols,