diff options
| author | Glenn Morris | 2008-06-21 19:48:40 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-06-21 19:48:40 +0000 |
| commit | 24f6e371b7adc81773e07153cfaa262d8ea97e31 (patch) | |
| tree | 8b05c6ef79d1526c63369e3835d53652567a39c2 | |
| parent | d5f5733533eb2e32f83555eabf81699b03c8d3b5 (diff) | |
| download | emacs-24f6e371b7adc81773e07153cfaa262d8ea97e31.tar.gz emacs-24f6e371b7adc81773e07153cfaa262d8ea97e31.zip | |
(all): Explicitly pass EMACS to sub-make, for some non-GNU makes.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/Makefile.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dfaffcb7bd4..e3e4a62c04d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -7,6 +7,9 @@ | |||
| 7 | 7 | ||
| 8 | 2008-06-21 Glenn Morris <rgm@gnu.org> | 8 | 2008-06-21 Glenn Morris <rgm@gnu.org> |
| 9 | 9 | ||
| 10 | * Makefile.in (all): Explicitly pass EMACS to sub-make, | ||
| 11 | for some non-GNU makes. | ||
| 12 | |||
| 10 | * cus-dep.el (custom-dependencies-no-scan-regexp): | 13 | * cus-dep.el (custom-dependencies-no-scan-regexp): |
| 11 | * finder.el (finder-no-scan-regexp): Add ldefs-boot.el | 14 | * finder.el (finder-no-scan-regexp): Add ldefs-boot.el |
| 12 | 15 | ||
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index badd94e56b3..d391080f493 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -104,7 +104,7 @@ setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \ | |||
| 104 | # we add them here to make sure they get built. | 104 | # we add them here to make sure they get built. |
| 105 | all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el | 105 | all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el |
| 106 | @: Let us check that we byte-compiled all the files. | 106 | @: Let us check that we byte-compiled all the files. |
| 107 | $(MAKE) $(MFLAGS) compile-last | 107 | $(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS) |
| 108 | 108 | ||
| 109 | doit: | 109 | doit: |
| 110 | 110 | ||