From 24bc4320795a1f67984ed7cb7aa33e9fef2ecdae Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 6 Jan 2010 21:27:33 +0000
Subject: [PATCH] 2010-01-06 22:26 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * INSTALL     ! Fixed instructions for .deb binary build.

  * contrib/hbide/hbide.hbp
    + Comment extended.

  * utils/hbmk2/hbmk2.prg
    + Comment extended.

  * config/globsh.mk
    ! Fixed typos in nt clean commands.
      [TOMERGE 2.0]

  * ChangeLog
    + Added TOMERGE 2.0 to prev entry.
---
 harbour/ChangeLog               | 18 ++++++++++++++++++
 harbour/INSTALL                 |  2 +-
 harbour/config/globsh.mk        |  8 ++++----
 harbour/contrib/hbide/hbide.hbp |  2 +-
 harbour/utils/hbmk2/hbmk2.prg   |  5 +++--
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5590899de6..251f50de87 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-06 22:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    ! Fixed instructions for .deb binary build.
+
+  * contrib/hbide/hbide.hbp
+    + Comment extended.
+
+  * utils/hbmk2/hbmk2.prg
+    + Comment extended.
+
+  * config/globsh.mk
+    ! Fixed typos in nt clean commands.
+      [TOMERGE 2.0]
+
+  * ChangeLog
+    + Added TOMERGE 2.0 to prev entry.
+
 2010-01-06 21:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * mpkg_tgz.sh
     ! Fixed to detect case when tar is mapped to bsdtar
@@ -27,6 +44,7 @@
               needs to be fixed, although current command should
               work on Snow Leopard.
     - Deleted comment no longer valid.
+      [TOMERGE 2.0]
 
   * utils/hbmk2/hbmk2.prg
     ! Fixed C++ memory manager override to handle zero size memory
diff --git a/harbour/INSTALL b/harbour/INSTALL
index fad3f4a5e8..7b5307676c 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -215,7 +215,7 @@ HARBOUR
    Binary .deb on Linux
    --------------------
 
-      $ fakeroot debian/rules
+      $ fakeroot debian/rules binary
 
    Binary .rpm on Linux
    --------------------
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index 611effcf6f..d870c9bfaa 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -114,13 +114,13 @@ clean::
 	$(if $(LIB_FILE),-@if exist "$(LIB_DIR_OS)" if not exist "$(LIB_DIR_OS)\*" $(RDP) "$(LIB_DIR_OS)",)
 	$(if $(BIN_FILE),-@if exist "$(BIN_FILE_OS)" $(RM) "$(BIN_FILE_OS)",)
 	$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).tds",)
-	$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).pdb",)
-	$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).ilk",)
+	$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).pdb" $(RM) "$(basename $(BIN_FILE_OS)).pdb",)
+	$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).ilk" $(RM) "$(basename $(BIN_FILE_OS)).ilk",)
 	$(if $(BIN_FILE),-@if exist "$(BIN_DIR_OS)" if not exist "$(BIN_DIR_OS)\*" $(RDP) "$(BIN_DIR_OS)",)
 	$(if $(DYN_FILE),-@if exist "$(DYN_FILE_OS)" $(RM) "$(DYN_FILE_OS)",)
 	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).tds",)
-	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).pdb",)
-	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).ilk",)
+	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).pdb" $(RM) "$(basename $(DYN_FILE_OS)).pdb",)
+	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).ilk" $(RM) "$(basename $(DYN_FILE_OS)).ilk",)
 	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).def" $(RM) "$(basename $(DYN_FILE_OS)).def",)
 	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).exp" $(RM) "$(basename $(DYN_FILE_OS)).exp",)
 	$(if $(DYN_FILE),-@if exist "$(DYN_DIR_OS)" if not exist "$(DYN_DIR_OS)\*" $(RDP) "$(DYN_DIR_OS)",)
diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp
index ad65c42b72..60e8bb7324 100644
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -10,7 +10,7 @@
 
 -ohbide
 
-# Trick to make it link using default Harbour builds
+# Trick to make QT 4.6 link using default Harbour builds
 -ldflag={msvc}-nodefaultlib:msvcrt.lib
 -ldflag={msvc}-defaultlib:libcmt.lib
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 14f545cb0f..3222b9fcbb 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2997,8 +2997,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
            ( hbmk[ _HBMK_cPLAT ] == "wce" .AND. hbmk[ _HBMK_cCOMP ] == "msvcarm" ) /* NOTE: Cross-platform: wce/ARM on win/x86 */
 
          /* ; Not enabled yet, because it would cause a lot of 3rd party code to
-              break due to sloppy type conversions and other trivial coding errors
-              usually not noticed with C compilers. [vszakats] */
+              break due to sloppy type conversions and other trivial coding mistakes
+              usually not noticed with C compilers. The other side-effect, is
+              much slower compilation process. [vszakats] */
 #if 0
          IF hbmk[ _HBMK_lCPP ] == NIL
             hbmk[ _HBMK_lCPP ] := .T.