Fix Windows makefiles to adapt to lisp/vc reorganization.

* lib-src/makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
  and vc/ediff-hook.elc.

* lisp/makefile.w32-in (WINS_BASIC): Include new directory vc.

2 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 606147f03aa..079941811c0 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc
+        and vc/ediff-hook.elc.
+
 2010-06-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * ntlib.h: Remove code dealing with BSTRING.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index bed28752f7b..cad3b838208 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -279,8 +279,8 @@ lisp2 = \
         $(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) \
         $(WINNT_SUPPORT) \