From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 Apr 2011 08:55:47 +0000 (+0300)
Subject: A better default for $(EMACS) in lisp/makefile.w32-in.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~434
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35eae264417272f74467ba42209c643988465085;p=emacs.git

A better default for $(EMACS) in lisp/makefile.w32-in.

 lisp/makefile.w32-in (EMACS): Default to ../src/$(BLD)/emacs.exe.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d5b9f592dd..8e698d37ba9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (EMACS): Default to ../src/$(BLD)/emacs.exe.
+
 2011-04-01  Juanma Barranquero  <lekktu@gmail.com>
 
 	* progmodes/idlwave.el (idlwave-one-key-select, idlwave-list-abbrevs):
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index ed2fe4031b7..c844a8f6630 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -27,9 +27,9 @@ lisp = $(CURDIR)
 srcdir = $(CURDIR)/..
 
 # You can specify a different executable on the make command line,
-# e.g. "make EMACS=../src/emacs ...".
+# e.g. "make EMACS=../bin/emacs ...".
 
-EMACS = $(THISDIR)/../bin/emacs.exe
+EMACS = ../src/$(BLD)/emacs.exe
 
 # Command line flags for Emacs.