aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2008-04-21 21:31:53 +0000
committerJason Rumney2008-04-21 21:31:53 +0000
commit361823f4948faf1bb81eee3d70717c3cb2ed085c (patch)
treea84c4680c5aacd1c4109de95de51d6f81c503aa6
parent92ec67e363032b8a677246d7571ea6c297d59707 (diff)
downloademacs-361823f4948faf1bb81eee3d70717c3cb2ed085c.tar.gz
emacs-361823f4948faf1bb81eee3d70717c3cb2ed085c.zip
(success): Print "make" rather than "gmake", as that
is what MingW uses.
-rw-r--r--nt/ChangeLog5
-rwxr-xr-xnt/configure.bat5
2 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 9252520cd3a..4adb653464a 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12008-04-21 Jason Rumney <jasonr@gnu.org>
2
3 * configure.bat (success): Print "make" rather than "gmake", as that
4 is what MingW uses.
5
12008-04-11 Eli Zaretskii <eliz@gnu.org> 62008-04-11 Eli Zaretskii <eliz@gnu.org>
2 7
3 * inc/sys/stat.h (__MINGW_NOTHROW): If not defined, define to nothing. 8 * inc/sys/stat.h (__MINGW_NOTHROW): If not defined, define to nothing.
diff --git a/nt/configure.bat b/nt/configure.bat
index 41c4528930d..ff47f033ba2 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -24,11 +24,11 @@ rem ----------------------------------------------------------------------
24rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: 24rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
25rem 25rem
26rem + MS Windows 95/98/Me or NT/2000/XP 26rem + MS Windows 95/98/Me or NT/2000/XP
27rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75 27rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75
28rem or later) and the Mingw32 and W32 API headers and libraries. 28rem or later) and the Mingw32 and W32 API headers and libraries.
29rem + Visual Studio 2005 is not supported at this time. 29rem + Visual Studio 2005 is not supported at this time.
30rem 30rem
31rem For reference, here is a list of which builds of gmake are known to 31rem For reference, here is a list of which builds of GNU make are known to
32rem work or not, and whether they work in the presence and/or absence of 32rem work or not, and whether they work in the presence and/or absence of
33rem sh.exe. 33rem sh.exe.
34rem 34rem
@@ -601,6 +601,7 @@ goto end
601:success 601:success
602echo Emacs successfully configured. 602echo Emacs successfully configured.
603echo Emacs successfully configured. >>config.log 603echo Emacs successfully configured. >>config.log
604if (%MAKECMD%) == (gmake) set MAKECMD=make
604echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install. 605echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install.
605goto end 606goto end
606 607