diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 4 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7775422417..abf0bb66b2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-05-21 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (update-subdirs-SH): | ||
| 4 | * Makefile.in (update-subdirs): Update for moved update-subdirs. | ||
| 5 | |||
| 1 | 2012-05-21 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2012-05-21 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. | 8 | * hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index ff211589f49..29ef8e40abe 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Maintenance productions for the Lisp directory | 1 | # Maintenance productions for the Lisp directory |
| 2 | # Copyright (C) 2000-2012 Free Software Foundation, Inc. | 2 | # Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | # This file is part of GNU Emacs. | 4 | # This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -179,7 +179,7 @@ $(lisp)/subdirs.el: | |||
| 179 | update-subdirs: doit | 179 | update-subdirs: doit |
| 180 | cd $(lisp); $(setwins_for_subdirs); \ | 180 | cd $(lisp); $(setwins_for_subdirs); \ |
| 181 | for file in $$wins; do \ | 181 | for file in $$wins; do \ |
| 182 | $(top_srcdir)/update-subdirs $$file; \ | 182 | $(top_srcdir)/build-aux/update-subdirs $$file; \ |
| 183 | done; | 183 | done; |
| 184 | 184 | ||
| 185 | updates: update-subdirs autoloads finder-data custom-deps | 185 | updates: update-subdirs autoloads finder-data custom-deps |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 7907c5f10ce..6cb8b3dd495 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. | 1 | # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. |
| 2 | # Copyright (C) 2000-2012 Free Software Foundation, Inc. | 2 | # Copyright (C) 2000-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | # This file is part of GNU Emacs. | 4 | # This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -243,9 +243,9 @@ update-subdirs-CMD: doit | |||
| 243 | echo ;; End:>> $(lisp)/subdirs.el | 243 | echo ;; End:>> $(lisp)/subdirs.el |
| 244 | 244 | ||
| 245 | update-subdirs-SH: doit | 245 | update-subdirs-SH: doit |
| 246 | $(srcdir)/update-subdirs $(lisp); \ | 246 | $(srcdir)/build-aux/update-subdirs $(lisp); \ |
| 247 | for file in $(WINS_SUBDIR); do \ | 247 | for file in $(WINS_SUBDIR); do \ |
| 248 | $(srcdir)/update-subdirs $$file; \ | 248 | $(srcdir)/build-aux/update-subdirs $$file; \ |
| 249 | done; | 249 | done; |
| 250 | 250 | ||
| 251 | updates: update-subdirs autoloads mh-autoloads finder-data custom-deps | 251 | updates: update-subdirs autoloads mh-autoloads finder-data custom-deps |