emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/src ChangeLog Makefile.in


From: Glenn Morris
Subject: [Emacs-diffs] emacs/src ChangeLog Makefile.in
Date: Sat, 22 Aug 2009 22:16:59 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/08/22 22:16:59

Modified files:
        src            : ChangeLog Makefile.in 

Log message:
        (bootstrap_exe): New variable.
        (.el.elc, ${lispsource}loaddefs.el, bootstrap-emacs${EXEEXT}):
        Use ${bootstrap_exe}.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7705&r2=1.7706
http://cvs.savannah.gnu.org/viewcvs/emacs/src/Makefile.in?cvsroot=emacs&r1=1.443&r2=1.444

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7705
retrieving revision 1.7706
diff -u -b -r1.7705 -r1.7706
--- ChangeLog   22 Aug 2009 10:26:14 -0000      1.7705
+++ ChangeLog   22 Aug 2009 22:16:58 -0000      1.7706
@@ -1,3 +1,9 @@
+2009-08-22  Glenn Morris  <address@hidden>
+
+       * Makefile.in (bootstrap_exe): New variable.
+       (.el.elc, ${lispsource}loaddefs.el, bootstrap-emacs${EXEEXT}):
+       Use ${bootstrap_exe}.
+
 2009-08-22  Eli Zaretskii  <address@hidden>
 
        * coding.h (encode_coding_string): Don't encode unibyte strings.

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/src/Makefile.in,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -b -r1.443 -r1.444
--- Makefile.in 1 Jul 2009 08:55:33 -0000       1.443
+++ Makefile.in 22 Aug 2009 22:16:59 -0000      1.444
@@ -63,6 +63,8 @@
 S_FILE = ${srcdir}/@opsysfile@
 config_h = config.h $(M_FILE) $(S_FILE)
 
+bootstrap_exe = ../src/bootstrap-emacs${EXEEXT}
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
@@ -1361,13 +1363,13 @@
    With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)"  */
 .el.elc:
        @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \
-                            THEFILE=$< EMACS=../src/bootstrap-emacs${EXEEXT}
+                            THEFILE=$< EMACS=${bootstrap_exe}
 
 /* Since the .el.elc rule cannot specify an extra dependency, we do it here.  
*/
 ${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS)
 
 ${lispsource}loaddefs.el: $(BOOTSTRAPEMACS)
-       cd ../lisp; $(MAKE) $(MFLAGS) autoloads 
EMACS=../src/bootstrap-emacs${EXEEXT}
+       cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=${bootstrap_exe}
 
 /* Dump an Emacs executable named bootstrap-emacs containing the
    files from loadup.el in source form.  */
@@ -1381,4 +1383,4 @@
        mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}
 #endif /* ! defined (CANNOT_DUMP) */
        @: Compile some files earlier to speed up further compilation.
-       cd ../lisp; $(MAKE) $(MFLAGS) compile-first 
EMACS=../src/bootstrap-emacs${EXEEXT}
+       cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}




reply via email to

[Prev in Thread] Current Thread [Next in Thread]