From: Jason Rumney Date: Mon, 21 Apr 2008 21:31:53 +0000 (+0000) Subject: (success): Print "make" rather than "gmake", as that X-Git-Tag: emacs-pretest-23.0.90~6151 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=361823f4948faf1bb81eee3d70717c3cb2ed085c;p=emacs.git (success): Print "make" rather than "gmake", as that is what MingW uses. --- diff --git a/nt/ChangeLog b/nt/ChangeLog index 9252520cd3a..4adb653464a 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2008-04-21 Jason Rumney + + * configure.bat (success): Print "make" rather than "gmake", as that + is what MingW uses. + 2008-04-11 Eli Zaretskii * 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 ---------------------------------------------------------------------- rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: rem rem + MS Windows 95/98/Me or NT/2000/XP -rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75 +rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75 rem or later) and the Mingw32 and W32 API headers and libraries. rem + Visual Studio 2005 is not supported at this time. rem -rem For reference, here is a list of which builds of gmake are known to +rem For reference, here is a list of which builds of GNU make are known to rem work or not, and whether they work in the presence and/or absence of rem sh.exe. rem @@ -601,6 +601,7 @@ goto end :success echo Emacs successfully configured. echo Emacs successfully configured. >>config.log +if (%MAKECMD%) == (gmake) set MAKECMD=make echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install. goto end