Mercurial > emacs
changeset 108973:506ba691342f
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.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 11 Jun 2010 23:26:13 +0200 |
| parents | 086d8a46a85d |
| children | f282583957c5 |
| files | lib-src/ChangeLog lib-src/makefile.w32-in lisp/ChangeLog lisp/makefile.w32-in |
| diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Fri Jun 11 23:19:23 2010 +0200 +++ b/lib-src/ChangeLog Fri Jun 11 23:26:13 2010 +0200 @@ -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.
--- a/lib-src/makefile.w32-in Fri Jun 11 23:19:23 2010 +0200 +++ b/lib-src/makefile.w32-in Fri Jun 11 23:26:13 2010 +0200 @@ -279,8 +279,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) \ $(WINNT_SUPPORT) \
--- a/lisp/ChangeLog Fri Jun 11 23:19:23 2010 +0200 +++ b/lisp/ChangeLog Fri Jun 11 23:26:13 2010 +0200 @@ -1,5 +1,7 @@ 2010-06-11 Juanma Barranquero <lekktu@gmail.com> + * makefile.w32-in (WINS_BASIC): Include new directory vc. + * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. 2010-06-11 Juri Linkov <juri@jurta.org>