From f43e6c2d4015d6b6609b99be66d0e7b84866af46 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 28 Sep 2010 01:54:18 +0000
Subject: [PATCH] 2010-09-28 03:53 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg   * config/global.mk   * INSTALL     !
 HB_BUILD_NAME/-build= no longer supports pathseps (backslash/fwdslash)      
 (it would need costly solution to resolve compilation of        hbrun.rc,
 maybe more. It's also "cleaner" this way, since the        dir structure is
 not altered)

---
 harbour/ChangeLog             | 9 +++++++++
 harbour/INSTALL               | 3 ++-
 harbour/config/global.mk      | 1 +
 harbour/utils/hbmk2/hbmk2.prg | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 49b8ee1646..30c9bca3e8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-09-28 03:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/global.mk
+  * INSTALL
+    ! HB_BUILD_NAME/-build= no longer supports pathseps (backslash/fwdslash)
+      (it would need costly solution to resolve compilation of 
+       hbrun.rc, maybe more. It's also "cleaner" this way, since the 
+       dir structure is not altered)
+
 2010-09-27 19:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbtrace.h
   * harbour/src/common/hbtrace.c
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 3059af3fea..c58531f135 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -659,7 +659,8 @@ HARBOUR
                                  NOTE: In current implementation it's
                                  appended to compiler directory name, so all
                                  filesystem/platform name rules and limits
-                                 apply. It's valid to use (back)slashes though.
+                                 apply. (Back)slashes will be stripped from 
+                                 the name though.
    - HB_BUILD_PKG=yes            Create release package. Default: no
                                  Requires 'clean install' in root source dir.
    - HB_BUILD_DYN=no             Create Harbour dynamic libraries. Default: yes
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 671a05d744..d7cd402cc7 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -88,6 +88,7 @@ find_in_path_prw = $(strip $(subst $(substpat), ,$(firstword $(subst |, ,$(subst
 
 # Some presets based on HB_BUILD_NAME
 ifneq ($(HB_BUILD_NAME),)
+   export HB_BUILD_NAME := $(subst /,,$(subst \,/,$(HB_BUILD_NAME)))
    ifeq ($(HB_BUILD_NAME),.r)
       HB_BUILD_DEBUG := no
       HB_BUILD_OPTIM := yes
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 43e1a09f4d..810c890c0d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1024,7 +1024,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       CASE Left( cParamL, 10 ) == "-platform=" ; ParseCOMPPLATCPU( hbmk, SubStr( cParam, 11 ), _TARG_PLAT )
       CASE Left( cParamL, 6 )  == "-arch="     ; ParseCOMPPLATCPU( hbmk, SubStr( cParam, 7 ), _TARG_PLAT ) /* Compatibility */
       CASE Left( cParamL, 5 )  == "-cpu="      ; ParseCOMPPLATCPU( hbmk, SubStr( cParam, 6 ), _TARG_CPU )
-      CASE Left( cParamL, 7 )  == "-build="    ; hbmk[ _HBMK_cBUILD ] := PathSepToSelf( SubStr( cParam, 8 ) )
+      CASE Left( cParamL, 7 )  == "-build="    ; hbmk[ _HBMK_cBUILD ] := StrTran( PathSepToSelf( SubStr( cParam, 8 ) ), hb_ps() )
       CASE Left( cParamL, 6 )  == "-build"     ; hbmk[ _HBMK_lStopAfterHarbour ] := .T.
       CASE Left( cParamL, 6 )  == "-lang="     ; hbmk[ _HBMK_cUILNG ] := SubStr( cParam, 7 ) ; SetUILang( hbmk )
       CASE Left( cParamL, 4 )  == "-shl"       ; hbmk[ _HBMK_lShowLevel ] := .T.