Use ${EXEEXT} more uniformly in makefiles

When porting Emacs to run on NaCl, we need to make sure that we always
call it with the proper extension (.nexe in this case) during the build.
* leim/Makefile.in, lib-src/Makefile.in, lisp/Makefile.in (EMACS):
Append ${EXEEXT}.
(tiny change)

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 4bda9a64335e682946bc133a8b545a122b27377a..a8dbca29526a5d0ea34c6dbf74712234e047a475 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-23  Pete Williamson  <petewil0@googlemail.com>  (tiny change)
+
+       Use ${EXEEXT} more uniformly in makefiles
+       When porting Emacs to run on NaCl, we need to make sure that we always
+       call it with the proper extension (.nexe in this case) during the build.
+       * Makefile.in (EMACS): Append ${EXEEXT}.
+
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Less 'make' chatter for leim

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7678c9784e597616cfd9c94bafbf0e0075..2ec03db49b72769c869e5cd673370f9ad1d62a6e 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -47,7 +47,7 @@ unexport EMACSDATA EMACSDOC EMACSPATH
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # and generate the file leim-list.el.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 
 # How to run Emacs.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4ac9638102fcc163d010508c8383bd2015b2e753..f161dbc038f49852fe951c34ae9d9705cd655d14 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use ${EXEEXT} more uniformly in makefiles
+       * Makefile.in (EMACS): Append ${EXEEXT}.
+
 2015-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify binary I/O configuration

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index d2705e7b5dc444abf0242817f7d5d73547a0c7cc..6b5d379e38b506e553e2f22cc1956d575587921f 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -21,7 +21,7 @@
 SHELL = @SHELL@
 
 # Following ../lisp/Makefile.in.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
 # ==================== Things `configure' will edit ====================

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c22ed24bb691b82dbc6b5a56aa99b8b41dc72a8..7b6b48b1018ea2733be5a46df88387e8722661d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use ${EXEEXT} more uniformly in makefiles
+       * Makefile.in (EMACS): Append ${EXEEXT}.
+
 2015-02-23  Sam Steingold  <sds@gnu.org>
 
        * files.el (recover-session): Handle `auto-save-list-file-prefix'

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc6326e19beaa335968c1aaeb5e404cb5e61f..22d5ddcf12f331b9dc6c8d3057bdc313919e9347 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
 # We never change directory before running Emacs, so a relative file
 # name is fine, and makes life easier.  If we need to change
 # directory, we can use emacs --chdir.
-EMACS = ../src/emacs
+EMACS = ../src/emacs${EXEEXT}
 
 # Command line flags for Emacs.