1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 52b7bf078f4..fc0a84128b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in (${lisp} ${SOME_MACHINE_LISP}, ../lisp/loaddefs.el):
+        Use $(BOOTSTRAPEMACS) rather than witness-emacs.
+        (bootstrap-emacs${EXEEXT}): Merge witness-emacs into it.
+        (witness-emacs): Remove.
+        (lisp, shortlisp): Move loaddefs.el earlier.
+        (mostlyclean): Forget about witness-emacs.
+
 2008-06-22  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (witness-emacs): Depend on temacs${EXEEXT}.