diff options
| author | Juanma Barranquero | 2011-12-10 13:49:33 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-12-10 13:49:33 +0100 |
| commit | e152e577f01ce584a086c5a10a25de972ff6e9d6 (patch) | |
| tree | 24d0e5be9ded8b121cbca88677f2e61e4cc17815 /lisp | |
| parent | 46d14be75497324f8420cf7a610733e75ccddc7c (diff) | |
| download | emacs-e152e577f01ce584a086c5a10a25de972ff6e9d6.tar.gz emacs-e152e577f01ce584a086c5a10a25de972ff6e9d6.zip | |
update-subdirs: Don't set no-byte-compile twice (bug#10260).
lisp/makefile.w32-in (update-subdirs-CMD): Use a Local Variables section.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 74fc51c5e69..c023f583d5f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-12-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in (update-subdirs-CMD): Use a Local Variables section. | ||
| 4 | |||
| 1 | 2011-12-10 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-12-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * textmodes/texnfo-upd.el: Update commentary. Add a warning not | 7 | * textmodes/texnfo-upd.el: Update commentary. Add a warning not |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index c844a8f6630..c8e535d4ac0 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -232,12 +232,15 @@ $(lisp)/subdirs.el: | |||
| 232 | update-subdirs: update-subdirs-$(SHELLTYPE) | 232 | update-subdirs: update-subdirs-$(SHELLTYPE) |
| 233 | 233 | ||
| 234 | update-subdirs-CMD: doit | 234 | update-subdirs-CMD: doit |
| 235 | echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el | 235 | echo ;; In load-path, after this directory should come> $(lisp)/subdirs.el |
| 236 | echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el | ||
| 237 | echo ;; certain of its subdirectories. Here we specify them.>> $(lisp)/subdirs.el | 236 | echo ;; certain of its subdirectories. Here we specify them.>> $(lisp)/subdirs.el |
| 238 | echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el | 237 | echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el |
| 239 | @for %%d in ($(WINS_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el | 238 | @for %%d in ($(WINS_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el |
| 240 | echo ))>> $(lisp)/subdirs.el | 239 | echo ))>> $(lisp)/subdirs.el |
| 240 | echo ;; Local Variables:>> $(lisp)/subdirs.el | ||
| 241 | echo ;; version-control: never>> $(lisp)/subdirs.el | ||
| 242 | echo ;; no-byte-compile: t>> $(lisp)/subdirs.el | ||
| 243 | echo ;; End:>> $(lisp)/subdirs.el | ||
| 241 | 244 | ||
| 242 | update-subdirs-SH: doit | 245 | update-subdirs-SH: doit |
| 243 | $(srcdir)/update-subdirs $(lisp); \ | 246 | $(srcdir)/update-subdirs $(lisp); \ |