# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1276340334 -7200
# Node ID abd6714f59e442d9fb8a7d140186f29909ad10ce
# Parent  c4552014bea2ef4f755283d58b885fa65d79a55d
* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.

diff -r c4552014bea2 -r abd6714f59e4 src/ChangeLog
--- a/src/ChangeLog	Sat Jun 12 10:59:37 2010 +0200
+++ b/src/ChangeLog	Sat Jun 12 12:58:54 2010 +0200
@@ -1,3 +1,8 @@
+2010-06-12  Romain Francoise  <romain@orebokech.com>
+
+	* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and
+	ediff-hook.
+
 2010-06-10  Glenn Morris  <rgm@gnu.org>
 
 	* editfns.c (Fbyte_to_string): Pacify compiler.
diff -r c4552014bea2 -r abd6714f59e4 src/Makefile.in
--- a/src/Makefile.in	Sat Jun 12 10:59:37 2010 +0200
+++ b/src/Makefile.in	Sat Jun 12 12:58:54 2010 +0200
@@ -458,8 +458,8 @@
 	${lispsource}textmodes/text-mode.elc \
 	${lispsource}emacs-lisp/timer.elc \
 	${lispsource}jka-cmpr-hook.elc \
-	${lispsource}vc-hooks.elc \
-	${lispsource}ediff-hook.elc \
+	${lispsource}vc/vc-hooks.elc \
+	${lispsource}vc/ediff-hook.elc \
 	${lispsource}epa-hook.elc \
 	${TOOLTIP_SUPPORT} \
 	${MSDOS_SUPPORT} \
@@ -549,9 +549,9 @@
 	../lisp/textmodes/paragraphs.elc \
 	../lisp/textmodes/text-mode.elc \
 	../lisp/emacs-lisp/timer.elc \
-	../lisp/vc-hooks.elc \
+	../lisp/vc/vc-hooks.elc \
+	../lisp/vc/ediff-hook.elc \
 	../lisp/jka-cmpr-hook.elc \
-	../lisp/ediff-hook.elc \
 	../lisp/epa-hook.elc \
 	../lisp/widget.elc \
 	../lisp/window.elc \