Mercurial > emacs
changeset 95640:70d0398a5c78
(compile, compile-always, bootstrap-prepare):
Explictly pass EMACS to sub-makes that use it, for non-GNU makes.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 08 Jun 2008 01:23:01 +0000 |
| parents | 2c12b44a3dfc |
| children | 23bdf2b1013d |
| files | lisp/Makefile.in |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/Makefile.in Sat Jun 07 13:52:12 2008 +0000 +++ b/lisp/Makefile.in Sun Jun 08 01:23:01 2008 +0000 @@ -1256,9 +1256,11 @@ # date. Some .el files don't get compiled because they set the # local variable no-byte-compile. # Calling make recursively because suffix rule cannot have prerequisites. +# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those +# sub-makes that run rules that use it, for the sake of some non-GNU makes. compile: $(emacs-deps) $(LOADDEFS) autoloads compile-first - $(MAKE) $(MFLAGS) compile-main - $(MAKE) $(MFLAGS) compile-last + $(MAKE) $(MFLAGS) compile-main EMACS=$(EMACS) + $(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS) ## Doing this causes make install to dump another emacs. # $(MAKE) $(MFLAGS) update-elclist @@ -1268,7 +1270,7 @@ # set the local variable no-byte-compile. compile-always: doit cd $(lisp); rm -f *.elc */*.elc - $(MAKE) $(MFLAGS) compile + $(MAKE) $(MFLAGS) compile EMACS=$(EMACS) ## In case any files are missing from ELCFILES. compile-last: @@ -1395,7 +1397,7 @@ bootstrap-prepare: if test -x $(EMACS); then \ - $(MAKE) $(MFLAGS) autoloads; \ + $(MAKE) $(MFLAGS) autoloads EMACS=$(EMACS); \ fi autogen-clean: