Re: [PATCH] for review - making use of {EXEEXT} more uniform in makefiles.

[Pete Williamson <petewil@google.com>]

[-- Attachment #1.1: Type: text/plain, Size: 679 bytes --]

Here is a single combined patch, with a change log entry.

Thanks, Paul for your comments!  All comments welcome!



On Fri, Feb 20, 2015 at 12:31 PM, Paul Eggert <eggert@cs.ucla.edu> wrote:

> Michal Nazarewicz wrote:
>
>> Unless there are some concerns I’ll push the fixed patch on Monday.
>>
>
> It's missing a ChangeLog entry and a commit message.  Could you please
> construct a single combined patch (rather than two), and generate it with
> the command 'git format-patch', and attach it to a followup email?   For an
> example of an email containing such a patch, please see:
>
> http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00909.html
>

[-- Attachment #1.2: Type: text/html, Size: 1283 bytes --]

[-- Attachment #2: 0001-Use-EXEEXT-more-uniformly-in-makefiles-when-running-.patch --]
[-- Type: text/x-patch, Size: 2320 bytes --]

From 1f2133ca8a968a40a04216bffbbbbcebebe2c72b Mon Sep 17 00:00:00 2001
From: Pete Williamson <petewil@chromium.org>
Date: Fri, 20 Feb 2015 17:44:42 -0800
Subject: [PATCH] Use {EXEEXT} more uniformly in makefiles when running
 executables.

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,
when Emacs has to run to generate leim-list.el and documentation.
---
 ChangeLog           | 4 ++++
 leim/Makefile.in    | 2 +-
 lib-src/Makefile.in | 2 +-
 lisp/Makefile.in    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4365668..98b68ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-20 Pete Williamson <petewil0@googlemail.com>
+	* Makefile.in - Use the {EXEEXT} environment variable more uniformly
+	to make sure that the emacs binary is used with the proper extension.
+
 2015-02-13  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* configure.ac: Set locallisppath to empty for NS self contained,
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 573acf7..2ec03db 100644
--- 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/Makefile.in b/lib-src/Makefile.in
index d2705e7..6b5d379 100644
--- 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/Makefile.in b/lisp/Makefile.in
index e5cfc63..22d5ddc 100644
--- 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.
 
-- 
2.2.0.rc0.207.ga3a616c