diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 628905e119..1776893f18 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,27 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-15 11:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/darwin/global.cf
+  * config/hpux/global.cf
+  * config/dos/global.cf
+  * config/win/global.cf
+  * config/linux/global.cf
+  * config/os2/global.cf
+  * config/sunos/global.cf
+  * config/bsd/global.cf
+  * config/wce/global.cf
+    + Added dir creation for executables.
+      This is a preparation step towards generating executables
+      inside bin/<ARCH>/<COMP>.
+    * Dir creation on OS/2 shells changed a bit, I hope it works,
+      and I'm not sure if it was intentional to use a different
+      solution than DOS/NT shells, since there is only GNU Make
+      logic involved. Anyhow, please test.
+
+  * config/dos/global.cf
+    % Deleted (unused) RANLIB reference.
+
 2009-07-15 10:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/win/bcc.cf
     ! Restored branch to use link script to avoid cmdline length
diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf
index 13a65f1ba1..264fbc2df3 100644
--- a/harbour/config/bsd/global.cf
+++ b/harbour/config/bsd/global.cf
@@ -25,6 +25,7 @@ RANLIB = ranlib
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf
index 127c91fd26..f04a73c777 100644
--- a/harbour/config/darwin/global.cf
+++ b/harbour/config/darwin/global.cf
@@ -23,6 +23,7 @@ RANLIB = ranlib
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index 4ee645675d..3e1b874ee0 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -22,6 +22,9 @@ OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
+EXE_DIR_OS = $(subst /,\,$(EXE_DIR))
+EXE_ARCH_DIR_OS = $(subst /,\,$(EXE_ARCH_DIR))
+EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
 DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -46,17 +49,16 @@ CP = $(COMSPEC) /Ccopy
 MV = move
 MD = md
 
-#this will be used only under DJGPP
-RANLIB = ranlib
-
 dirbase::
 	-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d\nul $(MD) %d
 	$(if $(LIB_ARCH_DIR_OS),-@$(COMSPEC) /Cfor %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d\nul $(MD) %d,)
+	$(if $(EXE_ARCH_DIR_OS),-@$(COMSPEC) /Cfor %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d\nul $(MD) %d,)
 
 clean::
 	-@$(COMSPEC) /Cfor %f in ($(OBJ_DIR_OS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
 	-@$(COMSPEC) /Cfor %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
 	$(if $(LIB_FILE_OS),-@$(COMSPEC) /Cif exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-@$(COMSPEC) /Cif exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 else  # bash
 
@@ -70,15 +72,13 @@ MV = mv -f
 MD = mkdir
 MDP = mkdir -p
 
-#this will be used only under MINGW
-RANLIB = ranlib
-
 dirbase::
 	@sh -c "[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)"
 	@sh -c "[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)"
+	@sh -c "[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)"
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
 
 endif
 endif
diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf
index 93aa78dbe9..e049a0516f 100644
--- a/harbour/config/hpux/global.cf
+++ b/harbour/config/hpux/global.cf
@@ -22,6 +22,7 @@ MDP = mkdir -p
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf
index fef350438e..da49404c2f 100644
--- a/harbour/config/linux/global.cf
+++ b/harbour/config/linux/global.cf
@@ -17,6 +17,9 @@ OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
 LIB_DIR_OS  = $(subst /,\,$(LIB_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
+EXE_DIR_OS  = $(subst /,\,$(EXE_DIR))
+EXE_ARCH_DIR_OS = $(subst /,\,$(EXE_ARCH_DIR))
+EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
 DIRSEP = $(subst /,\,\)
 
 MK = $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -39,10 +42,12 @@ ifeq ($(OS2_SHELL),) # non-OS/2
 dirbase::
 	-@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS)
 	$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),)
+	$(if $(EXE_DIR_OS),-@$(COMSPEC) /c if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),)
 
 clean::
 	-@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS)
 	$(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-@$(COMSPEC) /c if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 else # OS/2
    RM = del /n
@@ -51,26 +56,16 @@ else # OS/2
    CP = copy
    MV = move
 
-ifeq ($(LIB_ARCH_DIR),)
-
 dirbase::
 	-for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
+	$(if $(LIB_FILE_OS),-for %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d,)
+	$(if $(EXE_FILE_OS),-for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d $(MD) %d,)
 
 clean::
 	-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
 	-for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-
-else
-
-dirbase::
-	-for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS) $(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d
-
-clean::
-	-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
-	-for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-	-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS)
-
-endif
+	$(if $(LIB_FILE_OS),-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 endif
 
@@ -89,8 +84,9 @@ RANLIB = ranlib
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
 
 endif
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index bf65031e95..c34acc3453 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -17,6 +17,9 @@ OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
 LIB_DIR_OS  = $(subst /,\,$(LIB_DIR))
 LIB_ARCH_DIR_OS = $(subst /,\,$(LIB_ARCH_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
+EXE_DIR_OS  = $(subst /,\,$(EXE_DIR))
+EXE_ARCH_DIR_OS = $(subst /,\,$(EXE_ARCH_DIR))
+EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
 DIRSEP = $(subst /,\,\)
 
 MK := $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -39,10 +42,12 @@ ifeq ($(OS2_SHELL),) # non-OS/2
 dirbase::
 	-@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS)
 	$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),)
+	$(if $(EXE_DIR_OS),-@$(COMSPEC) /c if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),)
 
 clean::
 	-@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS)
 	$(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-@$(COMSPEC) /c if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 else # OS/2
    RM = del /n
@@ -51,26 +56,16 @@ else # OS/2
    CP = copy
    MV = move
 
-ifeq ($(LIB_ARCH_DIR),)
-
 dirbase::
 	-for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
+	$(if $(LIB_FILE_OS),-for %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d,)
+	$(if $(EXE_FILE_OS),-for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d $(MD) %d,)
 
 clean::
 	-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
 	-for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-
-else
-
-dirbase::
-	-for %d in ($(HB_ARCHITECTURE) $(OBJ_DIR_OS) $(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d
-
-clean::
-	-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
-	-for %d in ($(OBJ_DIR_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-	-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS)
-
-endif
+	$(if $(LIB_FILE_OS),-if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 endif
 
@@ -90,8 +85,9 @@ LIB_FILE_OS = $(LIB_FILE)
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
 
 endif
diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf
index 93aa78dbe9..e049a0516f 100644
--- a/harbour/config/sunos/global.cf
+++ b/harbour/config/sunos/global.cf
@@ -22,6 +22,7 @@ MDP = mkdir -p
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf
index e6c8db1102..90456458d4 100644
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -29,6 +29,8 @@ OBJ_DIR = $(ARCH_COMP)
 OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
+EXE_DIR_OS = $(subst /,\,$(EXE_DIR))
+EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
 DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -50,10 +52,12 @@ MV = move
 dirbase::
 	-@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS)
 	$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),)
+	$(if $(EXE_DIR_OS),-@$(COMSPEC) /c if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),)
 
 clean::
 	-@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS)
 	$(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-@$(COMSPEC) /c if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 else  # bash
 
@@ -69,8 +73,9 @@ MDP = mkdir -p
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
 
 endif
diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf
index e196383dff..ae75389454 100644
--- a/harbour/config/win/global.cf
+++ b/harbour/config/win/global.cf
@@ -25,6 +25,8 @@ OBJ_DIR = $(ARCH_COMP)
 OBJ_DIR_OS = $(subst /,\,$(ARCH_COMP))
 LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
 LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
+EXE_DIR_OS = $(subst /,\,$(EXE_DIR))
+EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
 DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -46,10 +48,12 @@ MV = move
 dirbase::
 	-@$(COMSPEC) /c if not exist $(OBJ_DIR_OS) $(MD) $(OBJ_DIR_OS)
 	$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS) $(MD) $(LIB_DIR_OS),)
+	$(if $(EXE_DIR_OS),-@$(COMSPEC) /c if not exist $(EXE_DIR_OS) $(MD) $(EXE_DIR_OS),)
 
 clean::
 	-@$(COMSPEC) /c if exist $(OBJ_DIR_OS) $(RD) $(OBJ_DIR_OS)
 	$(if $(LIB_FILE_OS),-@$(COMSPEC) /c if exist $(LIB_FILE_OS) $(RM) $(LIB_FILE_OS),)
+	$(if $(EXE_FILE_OS),-@$(COMSPEC) /c if exist $(EXE_FILE_OS) $(RM) $(EXE_FILE_OS),)
 
 else  # bash
 
@@ -65,8 +69,9 @@ MDP = mkdir -p
 dirbase::
 	@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
+	@[ -z $(EXE_DIR) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
 
 clean::
-	-$(RD) $(OBJ_DIR) $(LIB_FILE)
+	-$(RD) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE)
 
 endif