diff options
| author | Paul Eggert | 2012-05-20 19:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-20 19:33:13 -0700 |
| commit | 9b4ee6166fd8da5f8006a265f775d84e60c15be7 (patch) | |
| tree | 93ab66a914aecf8114ce919fab4cc34ed0ae0d5b /admin/ChangeLog | |
| parent | b847032c75e0cb4041a8736886e7054beb6f8696 (diff) | |
| download | emacs-9b4ee6166fd8da5f8006a265f775d84e60c15be7.tar.gz emacs-9b4ee6166fd8da5f8006a265f775d84e60c15be7.zip | |
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 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 55504b3d6f8..86069da7f0b 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-05-21 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Make merging from gnulib a script, not a makefile action. | ||
| 4 | * merge-gnulib: New script, with actions moved here from | ||
| 5 | ../Makefile.in. | ||
| 6 | |||
| 1 | 2012-05-19 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2012-05-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. | 9 | * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove. |