diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2000-11-02 18:49:04 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2000-11-02 18:49:04 +0000 |
| commit | 7f25090dcdeb737eed7abcf2460c4cd3ba59ee7d (patch) | |
| tree | ecd8906998bfdb9a13a0750cbd3654b1b026c03f /lisp/Makefile.in | |
| parent | 7dd6009c0ad08d5afd4f2c1787c79daab5b87493 (diff) | |
| download | emacs-7f25090dcdeb737eed7abcf2460c4cd3ba59ee7d.tar.gz | |
* Makefile.in (emacs): Set EMACSLOADPATH always.
(update-authors, .el.elc, compile-files): Don't do it explicitly here.
Diffstat (limited to 'lisp/Makefile.in')
| -rw-r--r-- | lisp/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index a42a8d77f0e..22ab5f74e3b 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -69,7 +69,7 @@ COMPILE_FIRST = \ # The actual Emacs command run in the targets below. -emacs = $(EMACS) $(EMACSOPT) +emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT) # Common command to find subdirectories @@ -124,7 +124,7 @@ updates: update-subdirs autoloads finder-data custom-deps # Update the AUTHORS file. update-authors: - EMACSLOADPATH=$(lisp) $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) + $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) TAGS: $(lisptagsfiles1) $(lisptagsfiles2) ${ETAGS} $(lisptagsfiles1) $(lisptagsfiles2) @@ -133,7 +133,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) ${ETAGS} -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2) .el.elc: subdirs.el - -EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $< + -$(emacs) -f batch-byte-compile $< $(DONTCOMPILE:.el=.elc): -rm -f $@ @@ -156,7 +156,7 @@ compile-files: subdirs.el doit tr ' ' '\012\012' | sort | uniq -u`; \ for el in $(COMPILE_FIRST) $$els; do \ echo Compiling $$el; \ - EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \ + $(emacs) -f batch-byte-compile $$el || exit 1; \ done # Backup compiled Lisp files in elc.tar.gz. If that file already |