diff options
| author | Jason Rumney | 2008-04-21 21:31:53 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-04-21 21:31:53 +0000 |
| commit | 361823f4948faf1bb81eee3d70717c3cb2ed085c (patch) | |
| tree | a84c4680c5aacd1c4109de95de51d6f81c503aa6 | |
| parent | 92ec67e363032b8a677246d7571ea6c297d59707 (diff) | |
| download | emacs-361823f4948faf1bb81eee3d70717c3cb2ed085c.tar.gz emacs-361823f4948faf1bb81eee3d70717c3cb2ed085c.zip | |
(success): Print "make" rather than "gmake", as that
is what MingW uses.
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rwxr-xr-x | nt/configure.bat | 5 |
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 @@ | |||
| 1 | 2008-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 | |||
| 1 | 2008-04-11 Eli Zaretskii <eliz@gnu.org> | 6 | 2008-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 ---------------------------------------------------------------------- | |||
| 24 | rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: | 24 | rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: |
| 25 | rem | 25 | rem |
| 26 | rem + MS Windows 95/98/Me or NT/2000/XP | 26 | rem + MS Windows 95/98/Me or NT/2000/XP |
| 27 | rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75 | 27 | rem + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75 |
| 28 | rem or later) and the Mingw32 and W32 API headers and libraries. | 28 | rem or later) and the Mingw32 and W32 API headers and libraries. |
| 29 | rem + Visual Studio 2005 is not supported at this time. | 29 | rem + Visual Studio 2005 is not supported at this time. |
| 30 | rem | 30 | rem |
| 31 | rem For reference, here is a list of which builds of gmake are known to | 31 | rem For reference, here is a list of which builds of GNU make are known to |
| 32 | rem work or not, and whether they work in the presence and/or absence of | 32 | rem work or not, and whether they work in the presence and/or absence of |
| 33 | rem sh.exe. | 33 | rem sh.exe. |
| 34 | rem | 34 | rem |
| @@ -601,6 +601,7 @@ goto end | |||
| 601 | :success | 601 | :success |
| 602 | echo Emacs successfully configured. | 602 | echo Emacs successfully configured. |
| 603 | echo Emacs successfully configured. >>config.log | 603 | echo Emacs successfully configured. >>config.log |
| 604 | if (%MAKECMD%) == (gmake) set MAKECMD=make | ||
| 604 | echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install. | 605 | echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install. |
| 605 | goto end | 606 | goto end |
| 606 | 607 | ||