From fd7f3d4a12155ae871d7296862200293de04402a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 1 Aug 2009 19:01:37 +0000
Subject: [PATCH] 2009-08-01 21:00 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.cf     % Some more opt. Rules are very clean and
 simple now without       redundancy. In fact only one line has be changed to
 move       away bin/lib/obj workdirs. There are no more hidden      
 dependencies on the dir names or layout.

---
 harbour/ChangeLog        | 7 +++++++
 harbour/config/global.cf | 6 ++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c2e72bda49..20219723c6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-01 21:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+    % Some more opt. Rules are very clean and simple now without
+      redundancy. In fact only one line has be changed to move
+      away bin/lib/obj workdirs. There are no more hidden
+      dependencies on the dir names or layout.
+
 2009-08-01 20:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
     % Minor opt/cleanup.
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index 16f48bc75d..412be73cf4 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -332,10 +332,8 @@ endif
 export HB_ARCHITECTURE
 export HB_COMPILER
 
-ARCH_COMP := $(HB_ARCHITECTURE)/$(HB_COMPILER)
-ifneq ($(HB_BUILD_NAME),)
-   ARCH_COMP := $(ARCH_COMP)$(subst \,/,$(HB_BUILD_NAME))
-endif
+ARCH_COMP := $(HB_ARCHITECTURE)/$(HB_COMPILER)$(subst \,/,$(HB_BUILD_NAME))
+
 OBJ_DIR := obj/$(ARCH_COMP)
 EXE_DIR := $(TOP)$(ROOT)bin/$(ARCH_COMP)
 LIB_DIR := $(TOP)$(ROOT)lib/$(ARCH_COMP)