* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.

diff --git a/src/ChangeLog b/src/ChangeLog
index 99ca9895c0e5ce6b2db8206f0eda9f3abbb3b294..44fe7f21ac853217e8da3fb0827ff4c9ea389b37 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/Makefile.in b/src/Makefile.in
index ceef8c3bf676d1cbc3085b4fd5295dd845921c65..b2fec7eb0853b12b5741dc72bbc0e85f41cdcb9a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -458,8 +458,8 @@ lisp= \
        ${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 @@ shortlisp= \
        ../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 \