diff options
| author | Eli Zaretskii | 2006-06-05 19:47:51 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2006-06-05 19:47:51 +0000 |
| commit | 3152b1ebb0edaf68289e5d6f6354f4ecf55afe89 (patch) | |
| tree | 2e2fb7c1334e4448e3b5946abb666251b32a5ee3 | |
| parent | 43c58260f6255240f0344774eca8fbd008eefa15 (diff) | |
| download | emacs-3152b1ebb0edaf68289e5d6f6354f4ecf55afe89.tar.gz emacs-3152b1ebb0edaf68289e5d6f6354f4ecf55afe89.zip | |
(bootstrap, $(lisp)/mh-e/mh-loaddefs.el): Quote $(EMACS).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2d05ef1ac07..43a97ec3709 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-06-05 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (bootstrap, $(lisp)/mh-e/mh-loaddefs.el): Quote | ||
| 4 | $(EMACS). | ||
| 5 | |||
| 1 | 2006-06-05 Richard Stallman <rms@gnu.org> | 6 | 2006-06-05 Richard Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * faces.el (defined-colors): Doc fix. | 8 | * faces.el (defined-colors): Doc fix. |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 16c2ae15441..6c5a68d9ec7 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -320,7 +320,7 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) | |||
| 320 | $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE) | 320 | $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE) |
| 321 | cp pre-mh-loaddefs.el-$(SHELLTYPE) $@ | 321 | cp pre-mh-loaddefs.el-$(SHELLTYPE) $@ |
| 322 | rm pre-mh-loaddefs.el-$(SHELLTYPE) | 322 | rm pre-mh-loaddefs.el-$(SHELLTYPE) |
| 323 | $(EMACS) $(EMACSOPT) \ | 323 | "$(EMACS)" $(EMACSOPT) \ |
| 324 | -l autoload \ | 324 | -l autoload \ |
| 325 | --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ | 325 | --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ |
| 326 | --eval "(setq find-file-suppress-same-file-warnings t)" \ | 326 | --eval "(setq find-file-suppress-same-file-warnings t)" \ |
| @@ -381,12 +381,12 @@ pre-mh-loaddefs.el-CMD: | |||
| 381 | bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el | 381 | bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el |
| 382 | 382 | ||
| 383 | bootstrap-clean-CMD: | 383 | bootstrap-clean-CMD: |
| 384 | # if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads | 384 | # if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads |
| 385 | cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el | 385 | cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el |
| 386 | -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g | 386 | -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g |
| 387 | 387 | ||
| 388 | bootstrap-clean-SH: | 388 | bootstrap-clean-SH: |
| 389 | # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi | 389 | # if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi |
| 390 | # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc | 390 | # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc |
| 391 | cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el | 391 | cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el |
| 392 | -for dir in . $(WINS); do rm -f $$dir/*.elc; done | 392 | -for dir in . $(WINS); do rm -f $$dir/*.elc; done |
| @@ -396,7 +396,7 @@ bootstrap-clean-SH: | |||
| 396 | # it will not be mistaken for an installed binary. | 396 | # it will not be mistaken for an installed binary. |
| 397 | 397 | ||
| 398 | bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps | 398 | bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps |
| 399 | - $(DEL) $(EMACS) | 399 | - $(DEL) "$(EMACS)" |
| 400 | 400 | ||
| 401 | # | 401 | # |
| 402 | # Assuming INSTALL_DIR is defined, copy the elisp files to it | 402 | # Assuming INSTALL_DIR is defined, copy the elisp files to it |