diff options
| author | Juanma Barranquero | 2010-06-11 23:26:13 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-06-11 23:26:13 +0200 |
| commit | 5fee75d49abccded929b80793d6fce1810effe86 (patch) | |
| tree | 9f986acd71a2fd7d7412fc0dc5351958e678e7dc /lisp | |
| parent | 69f18acc8d6bcbc552583dc634a030d163ea7d79 (diff) | |
| download | emacs-5fee75d49abccded929b80793d6fce1810effe86.tar.gz emacs-5fee75d49abccded929b80793d6fce1810effe86.zip | |
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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92616097b6d..4bccd2c7980 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-06-11 Juanma Barranquero <lekktu@gmail.com> | 1 | 2010-06-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * makefile.w32-in (WINS_BASIC): Include new directory vc. | ||
| 4 | |||
| 3 | * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. | 5 | * loadup.el ("vc-hooks", "ediff-hook"): Load from lisp/vc/. |
| 4 | 6 | ||
| 5 | 2010-06-11 Juri Linkov <juri@jurta.org> | 7 | 2010-06-11 Juri Linkov <juri@jurta.org> |
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=\ | |||
| 114 | play \ | 114 | play \ |
| 115 | progmodes \ | 115 | progmodes \ |
| 116 | textmodes \ | 116 | textmodes \ |
| 117 | url | 117 | url \ |
| 118 | vc | ||
| 118 | 119 | ||
| 119 | # Directories with lisp files to compile, and to extract data from | 120 | # Directories with lisp files to compile, and to extract data from |
| 120 | # (customs, autoloads, etc.) | 121 | # (customs, autoloads, etc.) |