diff options
| author | Romain Francoise <romain@orebokech.com> | 2010-06-12 12:58:54 +0200 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2010-06-12 12:58:54 +0200 |
| commit | 4176cba214cb44e6370cf951a9984c03bb2c4f9c (patch) | |
| tree | b26e95661adec8732c37a1fb10165f243ab45b04 /src | |
| parent | b81a0b569166c9aa39a00d861ab5a154f3dbdea3 (diff) | |
| download | emacs-4176cba214cb44e6370cf951a9984c03bb2c4f9c.tar.gz | |
* Makefile.in (lisp, shortlisp): Use new location of vc-hooks and ediff-hook.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 99ca9895c0e..44fe7f21ac8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-06-12 Romain Francoise <romain@orebokech.com> + + * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and + ediff-hook. + 2010-06-10 Glenn Morris <rgm@gnu.org> * editfns.c (Fbyte_to_string): Pacify compiler. diff --git a/src/Makefile.in b/src/Makefile.in index ceef8c3bf67..b2fec7eb085 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -458,8 +458,8 @@ lisp= \ ${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} \ ${MSDOS_SUPPORT} \ @@ -549,9 +549,9 @@ shortlisp= \ ../lisp/textmodes/paragraphs.elc \ ../lisp/textmodes/text-mode.elc \ ../lisp/emacs-lisp/timer.elc \ - ../lisp/vc-hooks.elc \ + ../lisp/vc/vc-hooks.elc \ + ../lisp/vc/ediff-hook.elc \ ../lisp/jka-cmpr-hook.elc \ - ../lisp/ediff-hook.elc \ ../lisp/epa-hook.elc \ ../lisp/widget.elc \ ../lisp/window.elc \ |