aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2015-02-23 10:09:51 -0800
committerPaul Eggert2015-02-23 10:10:24 -0800
commit6b62d265891cf28e263ff4c99054e30ffb1fb2b3 (patch)
tree6e82dd1f8471e9369f160ed07dc35aa4890f1f53 /lisp
parenta0edb0160b482bdb9ea48b82e440a3ec5763dd11 (diff)
downloademacs-6b62d265891cf28e263ff4c99054e30ffb1fb2b3.tar.gz
emacs-6b62d265891cf28e263ff4c99054e30ffb1fb2b3.zip
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)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c22ed24bb6..7b6b48b1018 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-02-23 Paul Eggert <eggert@cs.ucla.edu>
2
3 Use ${EXEEXT} more uniformly in makefiles
4 * Makefile.in (EMACS): Append ${EXEEXT}.
5
12015-02-23 Sam Steingold <sds@gnu.org> 62015-02-23 Sam Steingold <sds@gnu.org>
2 7
3 * files.el (recover-session): Handle `auto-save-list-file-prefix' 8 * files.el (recover-session): Handle `auto-save-list-file-prefix'
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index e5cfc6326e1..22d5ddcf12f 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ am__v_GEN_1 =
47# We never change directory before running Emacs, so a relative file 47# We never change directory before running Emacs, so a relative file
48# name is fine, and makes life easier. If we need to change 48# name is fine, and makes life easier. If we need to change
49# directory, we can use emacs --chdir. 49# directory, we can use emacs --chdir.
50EMACS = ../src/emacs 50EMACS = ../src/emacs${EXEEXT}
51 51
52# Command line flags for Emacs. 52# Command line flags for Emacs.
53 53