# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1209655132 0
# Node ID 26f40b2c5e7dcb4d9a29e24a32490932aa32c43c
# Parent  1734abb32f176162a0a5f6ce67960177bd3ae675
Revert incorrect fix for claimed bootstrap breakage.

diff -r 1734abb32f17 -r 26f40b2c5e7d lisp/ChangeLog
--- a/lisp/ChangeLog	Thu May 01 10:17:47 2008 +0000
+++ b/lisp/ChangeLog	Thu May 01 15:18:52 2008 +0000
@@ -1,3 +1,7 @@
+2008-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* Makefile.in: Revert incorrect fix for claimed bootstrap breakage.
+
 2008-05-01  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa-file-hook.el: New file split from epa-file.el.
@@ -590,6 +594,10 @@
 	(whitespace-report-list): Const initialization fix.
 	(whitespace-color-on): Code fix.
 
+2008-04-27  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.el: Unbreak bootstrap.
+
 2008-04-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-replace-environment-variables): New defun.
@@ -872,6 +880,8 @@
 	* cus-start.el: Remove insert-default-directory and
 	read-file-name-completion-ignore-case.
 
+	* Makefile.in (emacs-deps): Leave it empty.
+
 2008-04-23  Magnus Henoch  <mange@freemail.hu>
 
 	* tar-mode.el (tar-untar-buffer): If the entry has directory
diff -r 1734abb32f17 -r 26f40b2c5e7d lisp/Makefile.in
--- a/lisp/Makefile.in	Thu May 01 10:17:47 2008 +0000
+++ b/lisp/Makefile.in	Thu May 01 15:18:52 2008 +0000
@@ -81,7 +81,9 @@
 
 emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 # Prerequisites for running $(emacs)
-emacs-deps = $(lisp)/subdirs.el
+# This should not be necessary because in order to have ../src/emacs
+# we must have built subdirs.el already.
+# emacs-deps = $(lisp)/subdirs.el
 
 # Common command to find subdirectories