From b4fb0856f54fc97d88c85fa51dfed074542117bc Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 9 Jun 2010 20:42:12 +0000
Subject: [PATCH] 2010-06-09 22:38 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     ! Tuned watcom filename escaping
 behavior:       It will now use *nix notation on *nix builds.       It will
 now use double quoting on Windows builds.       It will now use single
 quoting in script files on all builds.       No quoting on other platforms. [
 watcom is special because       each platform native compiler can create
 builds for other       platforms, so we must use platform native fn quoting.
 ]

      This should in theory (hopefully) fix the remaining
      combinations for watcom, though I didn't test any
      of these. [ The only exception is using watcom Windows
      .exe via WINE on *nix systems. But that seems a little
      bit exotic of an option ;)
      Oh for testing pass some source filenames with spaces
      in them.
   ; TOCHECK: Whether watcom script files (@<fn>) use the same
              single quoting ('filename') on all platforms.
              For some reason so far it was only used for
              win targets, so I may have broken it, if it
              was done for good reason.
---
 harbour/ChangeLog             | 23 +++++++++++++++++++++++
 harbour/utils/hbmk2/hbmk2.prg | 14 ++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 267f60340b..90290919e4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,29 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-09 22:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Tuned watcom filename escaping behavior:
+      It will now use *nix notation on *nix builds.
+      It will now use double quoting on Windows builds.
+      It will now use single quoting in script files on all builds.
+      No quoting on other platforms. [ watcom is special because
+      each platform native compiler can create builds for other
+      platforms, so we must use platform native fn quoting. ]
+
+      This should in theory (hopefully) fix the remaining
+      combinations for watcom, though I didn't test any
+      of these. [ The only exception is using watcom Windows
+      .exe via WINE on *nix systems. But that seems a little
+      bit exotic of an option ;)
+      Oh for testing pass some source filenames with spaces
+      in them.
+   ; TOCHECK: Whether watcom script files (@<fn>) use the same
+              single quoting ('filename') on all platforms.
+              For some reason so far it was only used for
+              win targets, so I may have broken it, if it
+              was done for good reason.
+
 2010-06-09 21:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to use *nix-style filename escaping when calling
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 1f21785d0d..52f133adec 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3158,14 +3158,12 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
       /* Watcom family */
       CASE hbmk[ _HBMK_cCOMP ] == "watcom"
 
-         IF hbmk[ _HBMK_cPLAT ] == "win"
-            #if defined( __PLATFORM__UNIX )
-               hbmk[ _HBMK_nCmd_Esc ] := _ESC_NIX
-            #else
-               hbmk[ _HBMK_nCmd_Esc ] := _ESC_DBLQUOTE
-            #endif
-            hbmk[ _HBMK_nScr_Esc ] := _ESC_SGLQUOTE_WATCOM
-         ENDIF
+         #if defined( __PLATFORM__UNIX )
+            hbmk[ _HBMK_nCmd_Esc ] := _ESC_NIX
+         #elif defined( __PLATFORM__WINDOWS )
+            hbmk[ _HBMK_nCmd_Esc ] := _ESC_DBLQUOTE
+         #endif
+         hbmk[ _HBMK_nScr_Esc ] := _ESC_SGLQUOTE_WATCOM
 
          cLibPrefix := "LIB "
          cLibExt := ".lib"