[Emacs-diffs] Changes to emacs/lisp/Makefile.in,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/06/08 01:23:01

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- Makefile.in 7 Jun 2008 02:45:12 -0000       1.132
+++ Makefile.in 8 Jun 2008 01:23:01 -0000       1.133
@@ -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: