diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-21 01:38:39 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-06-21 01:38:39 +0000 |
| commit | fc46d2193603d395a8aaf254fa07e450744e2eb2 (patch) | |
| tree | 7cbffce7d24ea4adeabe982dea16e52561300668 /lisp/loadup.el | |
| parent | 5989ba2f87b231d9421ec13fb9e0811767921aa5 (diff) | |
| download | emacs-fc46d2193603d395a8aaf254fa07e450744e2eb2.tar.gz | |
Make "make" do a bootstrap if needed.
* src/Makefile.in (emacs${EXEEXT}): Link the new emacs to bootstrap-emacs.
(bootstrapclean): Remove.
(.el.elc): New rule.
(PRECOMP): New var.
(../lisp/subdirs.el): Remove.
(bootstrap-emacs${EXEEXT}): Remove subdirs.el and charpro.el dependency.
(witness-emacs): New target.
(mostlyclean): Remove witness-emacs as well.
(../lisp/loaddefs.el, ${lisp} ${SOME_MACHINE_LISP}):
Add witness-emacs dependency.
* lisp/loadup.el: Don't add emacs-<VERS> name when bootstrapping.
* lisp/Makefile.in (emacs-deps): Remove.
($(lisp)/cus-load.el, $(lisp)/finder-inf.el): Re-add.
(all): Use them.
(autogen-clean): Remove.
* Makefile.in (maybe_bootstrap, src/bootstrap-emacs${EXEEXT})
(bootstrap-build): Remove.
(top_bootclean): New var.
(top_distclean, bootstrap-clean): Use it.
(bootstrap): Don't recheck config. Make normally.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 805f82c09f4..eb51d10ee9e 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -343,14 +343,9 @@ (message "Dumping data as file temacs.dump") (dump-emacs "temacs.dump" "temacs") (kill-emacs)) - (let ((name (concat "emacs-" emacs-version))) - (while (string-match "[^-+_.a-zA-Z0-9]+" name) - (setq name (concat (downcase (substring name 0 (match-beginning 0))) - "-" - (substring name (match-end 0))))) - (if (memq system-type '(ms-dos windows-nt cygwin)) - (message "Dumping under the name emacs") - (message "Dumping under names emacs and %s" name))) + (if (memq system-type '(ms-dos windows-nt cygwin)) + (message "Dumping under the name emacs") + (message "Dumping under the name emacs")) (condition-case () (delete-file "emacs") (file-error nil)) @@ -361,12 +356,17 @@ (dump-emacs "emacs" "temacs") (message "%d pure bytes used" pure-bytes-used) ;; Recompute NAME now, so that it isn't set when we dump. - (if (not (memq system-type '(ms-dos windows-nt cygwin))) + (if (not (or (memq system-type '(ms-dos windows-nt cygwin)) + ;; Don't bother adding another name if we're just + ;; building bootstrap-emacs. + (equal (nth 3 command-line-args) "bootstrap") + (equal (nth 4 command-line-args) "bootstrap"))) (let ((name (concat "emacs-" emacs-version))) (while (string-match "[^-+_.a-zA-Z0-9]+" name) (setq name (concat (downcase (substring name 0 (match-beginning 0))) "-" (substring name (match-end 0))))) + (message "Adding name %s" name) (add-name-to-file "emacs" name t))) (kill-emacs))) |