From 3b0859f10f496265c3fc4333ec1963a4c4ffb03f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 15 Jul 2009 15:02:16 +0000
Subject: [PATCH] 2009-07-15 17:01 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.cf     + Added OBJ_BASE. (empty yet)

  * config/dos/global.cf
  * config/win/global.cf
  * config/linux/global.cf
  * config/os2/global.cf
  * config/wce/global.cf
    * Minor tweak to retain "chain of command".
---
 harbour/ChangeLog              | 11 +++++++++++
 harbour/config/dos/global.cf   |  2 +-
 harbour/config/global.cf       |  1 +
 harbour/config/linux/global.cf |  2 +-
 harbour/config/os2/global.cf   |  2 +-
 harbour/config/wce/global.cf   |  2 +-
 harbour/config/win/global.cf   |  2 +-
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dbfbb646ea..a710409b21 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-15 17:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+    + Added OBJ_BASE. (empty yet)
+
+  * config/dos/global.cf
+  * config/win/global.cf
+  * config/linux/global.cf
+  * config/os2/global.cf
+  * config/wce/global.cf
+    * Minor tweak to retain "chain of command".
+
 2009-07-15 16:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
     + Added new shell detection logic (not used yet)
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index 3e1b874ee0..d76c90b1c1 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -18,7 +18,7 @@ ifeq ($(SHLVL),) # non-bash
 # The MAKE requires '/' in filenames (OBJ_DIR) however some compilers
 # and some DOS commands require '\' (OBJ_DIR_OS)
 OBJ_DIR = $(ARCH_COMP)
-OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
+OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index f8e7e0f6d2..b5d8610e29 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -23,6 +23,7 @@ all: ; @echo Error: GNU Make version $(MAKE_VERSION) found, $(need) or upper nee
 else
 
 GRANDP = ../../
+OBJ_BASE :=
 ARCH_COMP := $(HB_ARCHITECTURE)/$(HB_COMPILER)
 
 # Directory separator default
diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf
index da49404c2f..8ca3c038e0 100644
--- a/harbour/config/linux/global.cf
+++ b/harbour/config/linux/global.cf
@@ -13,7 +13,7 @@ HB_GT_LIBS=\
 ifeq ($(SHLVL),) # non-bash
 
 OBJ_DIR = $(ARCH_COMP)
-OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
+OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS  = $(subst /,\,$(LIB_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index c34acc3453..a8920876bf 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -13,7 +13,7 @@ HB_GT_LIBS=\
 ifeq ($(SHLVL),) # non-bash
 
 OBJ_DIR = $(ARCH_COMP)
-OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
+OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS  = $(subst /,\,$(LIB_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf
index 90456458d4..5f5076bb24 100644
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -26,7 +26,7 @@ ifeq ($(SHLVL),) # non-bash
 # The MAKE requires '/' in filenames (OBJ_DIR) however some compilers
 # and some DOS commands require '\' (OBJ_DIR_OS)
 OBJ_DIR = $(ARCH_COMP)
-OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
+OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
 EXE_DIR_OS = $(subst /,\,$(EXE_DIR))
diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf
index ae75389454..6d97526675 100644
--- a/harbour/config/win/global.cf
+++ b/harbour/config/win/global.cf
@@ -22,7 +22,7 @@ ifeq ($(SHLVL),) # non-bash
 # The MAKE requires '/' in filenames (OBJ_DIR) however some compilers
 # and some DOS commands require '\' (OBJ_DIR_OS)
 OBJ_DIR = $(ARCH_COMP)
-OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
+OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
 EXE_DIR_OS = $(subst /,\,$(EXE_DIR))