Mercurial > emacs
changeset 33158:075e5f998739
* Makefile.in (emacs): Set EMACSLOADPATH always.
(update-authors, .el.elc, compile-files): Don't do it explicitly here.
| author | Ken Raeburn <raeburn@raeburn.org> |
|---|---|
| date | Thu, 02 Nov 2000 18:49:04 +0000 |
| parents | b3b6a57b5f5b |
| children | 1e1abe8ec96a |
| files | lisp/ChangeLog lisp/Makefile.in |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 02 18:44:05 2000 +0000 +++ b/lisp/ChangeLog Thu Nov 02 18:49:04 2000 +0000 @@ -1,3 +1,9 @@ +2000-11-02 Ken Raeburn <raeburn@gnu.org> + + * Makefile.in (emacs): Set EMACSLOADPATH always. + (update-authors, .el.elc, compile-files): Don't do it explicitly + here. + 2000-11-02 Dave Love <fx@gnu.org> * emacs-lisp/find-func.el (find-variable-regexp): Avoid defgroup.
--- a/lisp/Makefile.in Thu Nov 02 18:44:05 2000 +0000 +++ b/lisp/Makefile.in Thu Nov 02 18:49:04 2000 +0000 @@ -69,7 +69,7 @@ # 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 @@ # 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 @@ ${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 @@ 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