summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-05-20 19:33:13 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-05-20 19:33:13 -0700
commit9b4ee6166fd8da5f8006a265f775d84e60c15be7 (patch)
tree93ab66a914aecf8114ce919fab4cc34ed0ae0d5b /ChangeLog
parentb847032c75e0cb4041a8736886e7054beb6f8696 (diff)
downloademacs-9b4ee6166fd8da5f8006a265f775d84e60c15be7.tar.gz
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. * admin/merge-gnulib: New script, with actions moved here from ../Makefile.in.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cc5e493dd0..f95549d66a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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)