From 5fee75d49abccded929b80793d6fce1810effe86 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 11 Jun 2010 23:26:13 +0200 Subject: [PATCH] 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. --- lib-src/ChangeLog | 5 +++++ lib-src/makefile.w32-in | 4 ++-- lisp/ChangeLog | 2 ++ lisp/makefile.w32-in | 3 ++- 4 files changed, 11 insertions(+), 3 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 + + * makefile.w32-in (lisp2): Fix references to vc/vc-hooks.elc + and vc/ediff-hook.elc. + 2010-06-06 Dan Nicolaescu * 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) \ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92616097b6d..4bccd2c7980 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-06-11 Juanma Barranquero + * makefile.w32-in (WINS_BASIC): Include new directory vc. + * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. 2010-06-11 Juri Linkov diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index aebb8b352e7..871b690f007 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -114,7 +114,8 @@ WINS_BASIC=\ play \ progmodes \ textmodes \ - url + url \ + vc # Directories with lisp files to compile, and to extract data from # (customs, autoloads, etc.) -- 2.39.2