From 6329df655614bee06536d0dab0da7ac1108f51d9 Mon Sep 17 00:00:00 2001 From: Pete Williamson Date: Fri, 13 Feb 2015 16:59:39 -0800 Subject: [PATCH 1/2] 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. --- leim/Makefile.in | 2 +- lib-src/Makefile.in | 2 +- lisp/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/leim/Makefile.in b/leim/Makefile.in index 573acf7..70f2aca 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..d08aac5 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..3b0d109 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