aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog-2011 (renamed from m4/ChangeLog)8
-rw-r--r--m4/Makefile.am2
2 files changed, 9 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog-2011
index 5743e604a..218bc86f9 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 Werner Koch <[email protected]>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 1st, 2011 we put change information only in the GIT
+ commit log, and generate a top-level ChangeLog file from logs at
+ "make dist". See doc/HACKING for details.
+
2011-09-12 Werner Koch <[email protected]>
* libcurl.m4: Fix lost hash sign introduced by previous change.
@@ -150,4 +157,3 @@
* uintmax_t.m4: New file, from gettext-0.11.5.
* ulonglong.m4: New file, from gettext-0.11.5.
* Makefile.am: New file.
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d0d84e23d..c5ac24f69 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -12,6 +12,8 @@ EXTRA_DIST += estream.m4
EXTRA_DIST += sys_socket_h.m4 socklen.m4
+EXTRA_DIST += ChangeLog-2011
+