aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris2008-06-08 01:23:11 +0000
committerGlenn Morris2008-06-08 01:23:11 +0000
commit2c01ac6a3f86b688a80d51e1364e2ebedd83ddee (patch)
tree15a78fb039bdc2bb3d08fe94db8bd0e9b9ad63fb /lisp/Makefile.in
parent4958ed94efea5ede7c69bfdecdb4d59873db274a (diff)
downloademacs-2c01ac6a3f86b688a80d51e1364e2ebedd83ddee.tar.gz
emacs-2c01ac6a3f86b688a80d51e1364e2ebedd83ddee.zip
(compile, compile-always, bootstrap-prepare):
Explictly pass EMACS to sub-makes that use it, for non-GNU makes.
Diffstat (limited to 'lisp/Makefile.in')
-rw-r--r--lisp/Makefile.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9c2410fc96d..9de2741db81 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1256,9 +1256,11 @@ compile-main: $(ELCFILES)
1256# date. Some .el files don't get compiled because they set the 1256# date. Some .el files don't get compiled because they set the
1257# local variable no-byte-compile. 1257# local variable no-byte-compile.
1258# Calling make recursively because suffix rule cannot have prerequisites. 1258# Calling make recursively because suffix rule cannot have prerequisites.
1259# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those
1260# sub-makes that run rules that use it, for the sake of some non-GNU makes.
1259compile: $(emacs-deps) $(LOADDEFS) autoloads compile-first 1261compile: $(emacs-deps) $(LOADDEFS) autoloads compile-first
1260 $(MAKE) $(MFLAGS) compile-main 1262 $(MAKE) $(MFLAGS) compile-main EMACS=$(EMACS)
1261 $(MAKE) $(MFLAGS) compile-last 1263 $(MAKE) $(MFLAGS) compile-last EMACS=$(EMACS)
1262 1264
1263## Doing this causes make install to dump another emacs. 1265## Doing this causes make install to dump another emacs.
1264# $(MAKE) $(MFLAGS) update-elclist 1266# $(MAKE) $(MFLAGS) update-elclist
@@ -1268,7 +1270,7 @@ compile: $(emacs-deps) $(LOADDEFS) autoloads compile-first
1268# set the local variable no-byte-compile. 1270# set the local variable no-byte-compile.
1269compile-always: doit 1271compile-always: doit
1270 cd $(lisp); rm -f *.elc */*.elc 1272 cd $(lisp); rm -f *.elc */*.elc
1271 $(MAKE) $(MFLAGS) compile 1273 $(MAKE) $(MFLAGS) compile EMACS=$(EMACS)
1272 1274
1273## In case any files are missing from ELCFILES. 1275## In case any files are missing from ELCFILES.
1274compile-last: 1276compile-last:
@@ -1395,7 +1397,7 @@ $(CAL_DIR)/hol-loaddefs.el: $(emacs-deps) $(CAL_SRC)
1395 1397
1396bootstrap-prepare: 1398bootstrap-prepare:
1397 if test -x $(EMACS); then \ 1399 if test -x $(EMACS); then \
1398 $(MAKE) $(MFLAGS) autoloads; \ 1400 $(MAKE) $(MFLAGS) autoloads EMACS=$(EMACS); \
1399 fi 1401 fi
1400 1402
1401autogen-clean: 1403autogen-clean: