summaryrefslogtreecommitdiff
path: root/leim
diff options
context:
space:
mode:
Diffstat (limited to 'leim')
-rw-r--r--leim/ChangeLog7
-rw-r--r--leim/Makefile.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 4bda9a64335..a8dbca29526 100644
--- 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 573acf7678c..2ec03db49b7 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.