From ef5e5c27cc31a676a33b7d8defc231d243cf4a6a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 28 Feb 2009 09:27:01 +0000 Subject: [PATCH] 2009-02-28 10:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL * Cleaned the section dealing with GNU Make on Windows. --- 3.) Make sure to have GNU Make. We recommend the one distributed with MinGW. To get it: - Use your search engine with 'mingw gnu make' - Use this link: http://sourceforge.net/project/showfiles.php?group_id=2435 If you have it, you have three choices: - Put mingw32-make.exe anywhere in your PATH. (recommended) - Put mingw32-make.exe in Harbour source root dir. - Rename mingw32-make.exe to make.exe and put it in your PATH _before_ your compiler tools. --- * make_gnu.bat + mingw32-make.exe is now also accepted in Harbour's source tree root. --- harbour/ChangeLog | 20 ++++++++++++++++++++ harbour/INSTALL | 20 ++++++++++---------- harbour/make_gnu.bat | 1 + 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1f5be709e2..4cb904750a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-28 10:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + * Cleaned the section dealing with GNU Make on Windows. + --- + 3.) Make sure to have GNU Make. We recommend the one distributed + with MinGW. To get it: + - Use your search engine with 'mingw gnu make' + - Use this link: + http://sourceforge.net/project/showfiles.php?group_id=2435 + If you have it, you have three choices: + - Put mingw32-make.exe anywhere in your PATH. (recommended) + - Put mingw32-make.exe in Harbour source root dir. + - Rename mingw32-make.exe to make.exe and put it in + your PATH _before_ your compiler tools. + --- + + * make_gnu.bat + + mingw32-make.exe is now also accepted in Harbour's source + tree root. + 2009-02-28 10:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Reenabled and fixed call to entry function autodetection diff --git a/harbour/INSTALL b/harbour/INSTALL index 9fd3e1003f..92f693da35 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -58,16 +58,16 @@ HOW TO BUILD AND INSTALL HARBOUR 2.) Make sure to have your C compiler of choice properly installed. For the list of supporter compilers, please look up the relevant section in this file. - 3.) Make sure to have GNU Make, with the name make.exe, - accessible in the PATH _before_ the compiler tools. - We recommend using the GNU Make from the MinGW binary - distribution. Use your search engine with 'mingw gnu make' - or try this link: - http://sourceforge.net/project/showfiles.php?group_id=2435 - In some packages make.exe is called mingw32-make.exe, - just copy/rename it to make.exe then. - Alternatively you can place GNU Make under the name of - mingw32-make.exe anywhere in your PATH. + 3.) Make sure to have GNU Make. We recommend the one distributed + with MinGW. To get it: + - Use your search engine with 'mingw gnu make' + - Use this link: + http://sourceforge.net/project/showfiles.php?group_id=2435 + If you have it, you have three choices: + - Put mingw32-make.exe anywhere in your PATH. (recommended) + - Put mingw32-make.exe in Harbour source root dir. + - Rename mingw32-make.exe to make.exe and put it in + your PATH _before_ your compiler tools. > set HB_COMPILER= > set HB_INSTALL_PREFIX= diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index fc93da09f7..cc0f5c6666 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -88,6 +88,7 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL% set _HB_MAKE=make.exe if not "%OS%" == "Windows_NT" goto _FM_DONE set _HB_CHECK=mingw32-make.exe + if exist "%_HB_CHECK%" ( set _HB_MAKE=%_HB_CHECK%&& goto _FM_DONE ) set _HB_PATH=%PATH% :_FM_LOOP for /F "delims=; tokens=1,2*" %%p in ("%_HB_PATH%") do (