summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-06-11 23:26:13 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-06-11 23:26:13 +0200
commit5fee75d49abccded929b80793d6fce1810effe86 (patch)
tree9f986acd71a2fd7d7412fc0dc5351958e678e7dc /lib-src
parent69f18acc8d6bcbc552583dc634a030d163ea7d79 (diff)
downloademacs-5fee75d49abccded929b80793d6fce1810effe86.tar.gz
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.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/makefile.w32-in4
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) \