fold in the makefile.am changes entry

diff --git a/ChangeLog b/ChangeLog
index 2cbb4d39ce1fe3073dafbf36ff57c223387b0663..e786469a6c6de95893291b817b8f1eb2ed8fa2cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,11 @@ Changes in version 0.2.2.15-alpha - 2010-08-??
       old and broken version of libevent. Treat 1.4.14b-stable like
       1.4.14-stable when parsing the version. Fixes bug 1731; bugfix
       on 0.2.2.1-alpha.
+    - Don't use substitution references like $(VAR:MOD) when
+      $(asciidoc_files) is empty -- make(1) on NetBSD transforms
+      '$(:x)' to 'x' rather than the empty string. This bites us in
+      doc/ when configured with --disable-asciidoc. Bugfix on
+      0.2.2.9-alpha; fixes bug 1773.
 
 
 Changes in version 0.2.2.14-alpha - 2010-07-12

diff --git a/changes/makefile-var-exp b/changes/makefile-var-exp
deleted file mode 100644 (file)
index 9918e2a..0000000
--- a/changes/makefile-var-exp
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Don't use substitution references ($(VAR:MOD)) when
-      $(asciidoc_files) is empty -- make(1) on NetBSD transforms
-      '$(:x)' to 'x' rather than the empty string. This bites us in
-      doc/ when configured with --disable-asciidoc.  Fixes bug 1773.