From b7de8f385bd9dc5395453bc33dea4ad978bbe2e5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 2 Mar 2009 22:28:58 +0000
Subject: [PATCH] 2009-03-02 23:27 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * INSTALL     - Removed HB, HBPP envvars as cross-compilation
 requirements.

  * make_gnu_os2.cmd
    + Now honors HB_USER_MAKEFLAGS setting.

  * utils/hbmk2/hbmk2.prg
    + Added -n2 Harbour switch as default.
    ; TODO: If this works out well, we can remove explicit
            -n switches from .hbm files.

  * config/win/bcc.cf
    + Suppressing some OS commands to not pollute output.
---
 harbour/ChangeLog             | 15 +++++++++++++++
 harbour/INSTALL               |  2 --
 harbour/config/win/bcc.cf     |  6 +++---
 harbour/make_gnu_os2.cmd      |  2 +-
 harbour/utils/hbmk2/hbmk2.prg |  3 ++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cfd7780db1..ee4fe51ffa 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,21 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-02 23:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * INSTALL
+    - Removed HB, HBPP envvars as cross-compilation requirements.
+
+  * make_gnu_os2.cmd
+    + Now honors HB_USER_MAKEFLAGS setting.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added -n2 Harbour switch as default.
+    ; TODO: If this works out well, we can remove explicit
+            -n switches from .hbm files.
+
+  * config/win/bcc.cf
+    + Suppressing some OS commands to not pollute output.
+
 2009-03-02 21:28 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbcomp.h
   * harbour/include/hbcompdf.h
diff --git a/harbour/INSTALL b/harbour/INSTALL
index ddd726dc43..79f5f4d802 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -223,8 +223,6 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
    --------------
    HB_BIN_COMPILE=<HARBOUR_NATIVE_BUILD_DIR>\bin
    HB_PPGEN_PATH=<HARBOUR_NATIVE_BUILD_DIR>\bin
-   HB=<HARBOUR_NATIVE_BUILD_DIR>\bin\harbour[.exe]
-   HBPP=<HARBOUR_NATIVE_BUILD_DIR>\bin\hbpp[.exe]
 
    You need these when building for a platform different to host.
    For this to work, you will need to point above envvars to
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index 203eeb4cd4..b2c5a59c8f 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -71,14 +71,14 @@ LDFLAGS = $(LINKPATHS)
 
 #Note: The empty line below HAVE TO exist!
 define lib_object
-echo -+$(subst /,\,$(file)) ^& >> __lib__.tmp
+@echo -+$(subst /,\,$(file)) ^& >> __lib__.tmp
 
 endef
 
 define create_library
-if exist __lib__.tmp del __lib__.tmp
+@if exist __lib__.tmp del __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
-echo -+>> __lib__.tmp
+@echo -+>> __lib__.tmp
 $(AR) $(subst /,\,$(LIB_DIR)/$@) /P64 $(ARFLAGS) @__lib__.tmp
 endef
 
diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd
index d4ccd3baa9..75bb055486 100644
--- a/harbour/make_gnu_os2.cmd
+++ b/harbour/make_gnu_os2.cmd
@@ -49,4 +49,4 @@ if "%HB_OS2_TCP32%" == "YES" goto tcp32
    set HB_USER_CFLAGS=-DTCPV40HDRS %HB_USER_CFLAGS%
 :tcp32
 
-make %1 %2 %3 %4 %5 %6 %7 %8 %9
+make %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 4e38aa1781..9855389b5f 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -882,6 +882,7 @@ FUNCTION Main( ... )
 
 #if defined( HBMK_INTEGRATED_COMPILER )
       aCommand := ArrayAJoin( { s_aPRG,;
+                                { "-n2" },;
                                 { "-i" + s_cHB_INC_INSTALL },;
                                 ListToArray( cSelfFlagPRG ),;
                                 ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),;
@@ -899,7 +900,7 @@ FUNCTION Main( ... )
 #else
       cCommand := DirAddPathSep( s_cHB_BIN_INSTALL ) +;
                   cBin_CompPRG +;
-                  " " + ArrayToList( s_aPRG ) +;
+                  " -n2 " + ArrayToList( s_aPRG ) +;
                   " -i" + s_cHB_INC_INSTALL +;
                   iif( s_lBLDFLGP, " " + cSelfFlagPRG, "" ) +;
                   iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) +;