From 35eae264417272f74467ba42209c643988465085 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 2 Apr 2011 11:55:47 +0300 Subject: [PATCH 1/1] A better default for $(EMACS) in lisp/makefile.w32-in. lisp/makefile.w32-in (EMACS): Default to ../src/$(BLD)/emacs.exe. --- lisp/ChangeLog | 4 ++++ lisp/makefile.w32-in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d5b9f592d..8e698d37ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-04-02 Eli Zaretskii + + * makefile.w32-in (EMACS): Default to ../src/$(BLD)/emacs.exe. + 2011-04-01 Juanma Barranquero * progmodes/idlwave.el (idlwave-one-key-select, idlwave-list-abbrevs): diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index ed2fe4031b..c844a8f663 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. -- 2.39.2