From 5a658b2c03bd83f1685cbb9e905ecdc049b0ae23 Mon Sep 17 00:00:00 2001
From: Ryszard Glab <rglab@imid.med.pl>
Date: Thu, 31 Jan 2008 11:36:57 +0000
Subject: [PATCH] 2008-01-31 12:40 UTC+0100 Ryszard Glab <harbour//rglab.pl>   
 * doc/howtosvn.txt       * svn update does not report locally modified files
 - it is         required to run 'svn status' to list all changed files

   * config/lib.cf
   * config/bin.cf
   * config/darwin/gcc.cf
   * config/darwin/global.cf
   * config/hpux/gcc.cf
   * config/hpux/global.cf
   * config/dos/owatcom.cf
   * config/dos/watcom.cf
   * config/dos/bcc16.cf
   * config/dos/global.cf
   * config/dos/rsx32.cf
   * config/dos/djgpp.cf
   * config/global.cf
   * config/linux/owatcom.cf
   * config/linux/gcc.cf
   * config/linux/global.cf
   * config/os2/gcc.cf
   * config/os2/icc.cf
   * config/os2/global.cf
   * config/sunos/gcc.cf
   * config/sunos/global.cf
   * config/bsd/gcc.cf
   * config/bsd/global.cf
   * config/w32/msvc.cf
   * config/w32/owatcom.cf
   * config/w32/watcom.cf
   * config/w32/bcc32.cf
   * config/w32/gcc.cf
   * config/w32/xcc.cf
   * config/w32/rsxnt.cf
   * config/w32/global.cf
   * config/w32/cemgw.cf
   * config/w32/pocc.cf
   * config/w32/mingw32.cf
      * updated to create libraries in harbour/lib/<arch>/<compiler>
        subdirectories
      NOTE: only 'linux/gcc' modifications were tested -please
      report any problems (mostly slash or backslash issues probably)
---
 harbour/ChangeLog               | 44 +++++++++++++++++++++++++++++++++
 harbour/config/bin.cf           |  2 ++
 harbour/config/bsd/gcc.cf       |  6 ++---
 harbour/config/bsd/global.cf    |  2 ++
 harbour/config/darwin/gcc.cf    |  6 ++---
 harbour/config/darwin/global.cf |  2 ++
 harbour/config/dos/bcc16.cf     |  8 +++---
 harbour/config/dos/djgpp.cf     |  6 ++---
 harbour/config/dos/global.cf    |  8 ++++++
 harbour/config/dos/owatcom.cf   | 10 +++++---
 harbour/config/dos/rsx32.cf     |  6 ++---
 harbour/config/dos/watcom.cf    | 10 +++++---
 harbour/config/global.cf        | 10 ++++----
 harbour/config/hpux/gcc.cf      |  6 ++---
 harbour/config/hpux/global.cf   |  2 ++
 harbour/config/lib.cf           |  5 ++++
 harbour/config/linux/gcc.cf     |  6 ++---
 harbour/config/linux/global.cf  |  2 ++
 harbour/config/linux/owatcom.cf |  8 +++---
 harbour/config/os2/gcc.cf       | 10 +++-----
 harbour/config/os2/global.cf    | 10 ++++++++
 harbour/config/os2/icc.cf       | 10 ++++----
 harbour/config/sunos/gcc.cf     |  6 ++---
 harbour/config/sunos/global.cf  |  2 ++
 harbour/config/w32/bcc32.cf     |  8 +++---
 harbour/config/w32/cemgw.cf     |  8 +++---
 harbour/config/w32/gcc.cf       |  6 ++---
 harbour/config/w32/global.cf    | 12 +++++++++
 harbour/config/w32/mingw32.cf   |  8 +++---
 harbour/config/w32/msvc.cf      |  6 ++---
 harbour/config/w32/owatcom.cf   |  8 +++---
 harbour/config/w32/pocc.cf      | 10 ++------
 harbour/config/w32/rsxnt.cf     |  6 ++---
 harbour/config/w32/watcom.cf    | 10 +++++---
 harbour/config/w32/xcc.cf       | 10 ++------
 harbour/doc/howtosvn.txt        | 14 ++++++-----
 36 files changed, 176 insertions(+), 117 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5867603dcd..9e63b9a6d8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,50 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-01-31 12:40 UTC+0100 Ryszard Glab <harbour//rglab.pl>
+   * doc/howtosvn.txt
+      * svn update does not report locally modified files - it is 
+        required to run 'svn status' to list all changed files
+        
+   * config/lib.cf
+   * config/bin.cf
+   * config/darwin/gcc.cf
+   * config/darwin/global.cf
+   * config/hpux/gcc.cf
+   * config/hpux/global.cf
+   * config/dos/owatcom.cf
+   * config/dos/watcom.cf
+   * config/dos/bcc16.cf
+   * config/dos/global.cf
+   * config/dos/rsx32.cf
+   * config/dos/djgpp.cf
+   * config/global.cf
+   * config/linux/owatcom.cf
+   * config/linux/gcc.cf
+   * config/linux/global.cf
+   * config/os2/gcc.cf
+   * config/os2/icc.cf
+   * config/os2/global.cf
+   * config/sunos/gcc.cf
+   * config/sunos/global.cf
+   * config/bsd/gcc.cf
+   * config/bsd/global.cf
+   * config/w32/msvc.cf
+   * config/w32/owatcom.cf
+   * config/w32/watcom.cf
+   * config/w32/bcc32.cf
+   * config/w32/gcc.cf
+   * config/w32/xcc.cf
+   * config/w32/rsxnt.cf
+   * config/w32/global.cf
+   * config/w32/cemgw.cf
+   * config/w32/pocc.cf
+   * config/w32/mingw32.cf
+      * updated to create libraries in harbour/lib/<arch>/<compiler>
+        subdirectories
+      NOTE: only 'linux/gcc' modifications were tested -please
+      report any problems (mostly slash or backslash issues probably)
+
 2008-01-30 21:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
    * contrib/gtwvg/common.mak
    * contrib/hbapollo/common.mak
diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf
index 4168c6e941..8dbdd0619b 100644
--- a/harbour/config/bin.cf
+++ b/harbour/config/bin.cf
@@ -27,8 +27,10 @@ _EXE_ARCH = $(notdir $(ARCH_DIR))
 ifeq ($(_EXE_ARCH),)
 # ARCH_DIR ends with a slash
 EXE_ARCH = $(ARCH_DIR)$(EXE_NAME)
+LIB_DIR := $(TOP)$(ROOT)lib/$(ARCH_DIR)
 else
 EXE_ARCH = $(ARCH_DIR)/$(EXE_NAME)
+LIB_DIR := $(TOP)$(ROOT)lib/$(ARCH_DIR)/
 endif
 
 ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index b1b8f7540e..259460cf40 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -21,7 +21,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -33,14 +33,12 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library and other RTLs
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
 
 # screen driver libraries
@@ -90,6 +88,6 @@ LDFLAGS +=  $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/bsd/global.cf b/harbour/config/bsd/global.cf
index 02e8c00db8..aacbe63c8b 100644
--- a/harbour/config/bsd/global.cf
+++ b/harbour/config/bsd/global.cf
@@ -48,6 +48,8 @@ RANLIB = ranlib
 
 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
+	@[ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index 547dbf32e2..4d85e92435 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -37,7 +37,7 @@ LINKLIBS += $(foreach lib, $(HB_USER_LIBS), -l$(lib))
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -47,14 +47,12 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library and other RTLs
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 
 # screen driver libraries
@@ -106,7 +104,7 @@ LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $@ $(^F) $(LDFLAGS) $(L_USR) $(LINKLIBS) $(L
 #AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@
 LIBTOOL = libtool
 LIBTOOLFLAGS = $(LIBTOOL_USR)
-AR_RULE = $(LIBTOOL) -static $(LIBTOOLFLAGS) -o $@ $(^F) || $(RM) $@
+AR_RULE = $(LIBTOOL) -static $(LIBTOOLFLAGS) -o $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 RANLIB = ranlib
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/darwin/global.cf b/harbour/config/darwin/global.cf
index bbfd0c220c..0a9a017025 100644
--- a/harbour/config/darwin/global.cf
+++ b/harbour/config/darwin/global.cf
@@ -46,6 +46,8 @@ RANLIB = ranlib
 
 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
+	@[ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)
diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf
index d3cd7f7ee7..f01af7099c 100644
--- a/harbour/config/dos/bcc16.cf
+++ b/harbour/config/dos/bcc16.cf
@@ -49,9 +49,9 @@ LD = bcc
 LDFLAGS = -i48 -O2 -mh $(L_USR)
 ifeq ($(HB_LIB_COMPILE),)
 LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
-LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib)$(LIB_EXT))
+LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT))
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(lib)/$(HB_ARCH)/$(lib)$(LIB_EXT))
+LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(LIB_DIR)$(lib)$(LIB_EXT))
 endif
 else
 LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
@@ -65,7 +65,7 @@ LD_RULE = $(link_exe_file)
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 ifeq ($(HB_LIB_COMPILE),)
-LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)$(LIB_EXT))
+LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)$(LIB_EXT))
 else
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
@@ -78,7 +78,7 @@ echo. -+$(file) &>> __lib__.tmp
 endef
 
 define create_library
-echo. $@ &> __lib__.tmp
+echo. $(LIB_DIR)/$@ &> __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 echo. ,, >> __lib__.tmp
 $(AR) $(ARFLAGS) @__lib__.tmp
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 9d3a5e5831..5b0f68ace3 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -25,7 +25,7 @@ LDLIBS = -lm
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -34,13 +34,11 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library and other RTLs
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
 endif
 
@@ -54,7 +52,7 @@ endef
 # We have to use script to overcome the DOS limit of max 128 characters
 # in commmand line
 define create_library
-echo. CREATE $@ > __lib__.tmp
+echo. CREATE $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 echo. SAVE >> __lib__.tmp
 echo. END >> __lib__.tmp
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index 7d2b47e94a..fb4dcc93cd 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -34,6 +34,8 @@ ifeq ($(SHLVL),) # COMMAND.COM
 # and some DOS commands require '\' (ARCH_DOS)
 ARCH_DIR = $(subst \,/,$(HB_ARCH))
 ARCH_DOS = $(subst /,\,$(HB_ARCH))
+LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
+LIB_PATH_DOS = $(subst /,\,$(LIB_PATH))
 DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -75,10 +77,13 @@ RANLIB = ranlib
 
 dirbase::
 	-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %d\nul $(MD) %d
+	-@$(COMSPEC) /Cfor %d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %d\nul $(MD) %d
 
 clean::
 	-@$(COMSPEC) /Cfor %f in ($(ARCH_DOS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
 	-@$(COMSPEC) /Cfor %d in ($(ARCH_DOS) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
+	-@$(COMSPEC) /Cfor %f in ($(LIB_DIR_DOS)\*.*) do $(RM) %f
+	-@$(COMSPEC) /Cfor %d in ($(LIB_DIR_DOS) $(LIB_PATH_DOS)) do if exist %d\nul $(RD) %d
 
 else  # bash
 
@@ -98,9 +103,12 @@ RANLIB = ranlib
 dirbase::
 	@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE); \
 	 [ -d $(ARCH_DIR) ] || $(MD) $(ARCH_DIR)
+	@[ -d $(LIB_PATH) ] || $(MD) $(LIB_PATH); \
+	 [ -d $(LIB_DIR) ] || $(MD) $(LIB_DIR)
 
 clean::
 	-$(RD) $(HB_ARCH)
+	-$(RD) $(LIB_DIR)
 
 endif
 endif
diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf
index c920c22c06..82ae14749b 100644
--- a/harbour/config/dos/owatcom.cf
+++ b/harbour/config/dos/owatcom.cf
@@ -64,7 +64,7 @@ LDFLAGS = debug all OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe
 
 ifeq ($(HB_LIB_COMPILE),)
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))))
-   LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib)))
+   LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(LIB_DIR)/$(lib)))
 else
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
    LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
@@ -73,7 +73,7 @@ endif
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
    ifeq ($(HB_LIB_COMPILE),)
-      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv))
+      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
    else
       RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv))
    endif
@@ -82,7 +82,7 @@ endif
 
 ifeq ($(findstring rtl,$(LIBS)),rtl)
    ifeq ($(HB_LIB_COMPILE),)
-      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt))
+      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
    else
       GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt))
    endif
@@ -97,8 +97,10 @@ echo. -+$(file) >> __lib__.tmp
 
 endef
 
+LIB_DDIR := $(subst /,\,$(LIB_DIR))
+
 define create_library
-echo. $@ > __lib__.tmp
+echo. $(LIB_DDIR)\$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 $(AR) $(ARFLAGS) @__lib__.tmp
 endef
diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf
index 5b15e21c2b..f0001659bd 100644
--- a/harbour/config/dos/rsx32.cf
+++ b/harbour/config/dos/rsx32.cf
@@ -24,7 +24,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -38,13 +38,11 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library and other RTLs
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 endif
 
@@ -57,6 +55,6 @@ LDFLAGS += $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf
index e16bc59ab3..bd90aeb35a 100644
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -45,7 +45,7 @@ LD = wlink
 LDFLAGS = debug all OP osn=DOS4G OP stack=65536 OP CASEEXACT
 ifeq ($(HB_LIB_COMPILE),)
 LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))))
-LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib)))
+LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(LIB_DIR)/$(lib)))
 else
 LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
 LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
@@ -53,10 +53,10 @@ endif
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(subst /,\,$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv)))
+RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(subst /,\,$(LIB_DIR)/$(drv)))
 endif
 
-GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(subst /,\,$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)))
+GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(subst /,\,$(LIB_DIR)/$(gt)))
 
 LD_RULE = $(link_exe_file)
 
@@ -66,8 +66,10 @@ $(COMSPEC) /E:2048 /Cecho -+$(file) >> __lib__.tmp
 
 endef
 
+LIB_DDIR := $(subst /,\,$(LIB_DIR))
+
 define create_library
-$(COMSPEC) /E:2048 /Cecho $@ > __lib__.tmp
+$(COMSPEC) /E:2048 /Cecho $(LIB_DDIR)\$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 $(AR) $(ARFLAGS) @__lib__.tmp
 endef
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index b34799b743..c58443d2e3 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -6,12 +6,12 @@ GRANDP = ../../
 HB_ARCH := $(HB_ARCHITECTURE)/$(HB_COMPILER)
 
 HB_DB_DRIVERS=\
-	dbfntx \
-	dbfcdx \
-	dbffpt \
+	rddntx \
+	rddcdx \
+	rddfpt \
 	hbsix \
-	hsx \
-	usrrdd \
+	hbhsx \
+	hbusrrdd \
 
 
 ifneq ($(HB_DB_DRVEXT),)
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index 79f3a64cfa..4ddffb36e5 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -31,7 +31,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -40,14 +40,12 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 
 # screen driver libraries
@@ -86,6 +84,6 @@ LDFLAGS += $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) cr $@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/hpux/global.cf b/harbour/config/hpux/global.cf
index aa0018e8c2..d0ab989e63 100644
--- a/harbour/config/hpux/global.cf
+++ b/harbour/config/hpux/global.cf
@@ -46,6 +46,8 @@ MDP = mkdir -p
 
 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
+	@[ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)
diff --git a/harbour/config/lib.cf b/harbour/config/lib.cf
index fef28033b5..35ade8cf93 100644
--- a/harbour/config/lib.cf
+++ b/harbour/config/lib.cf
@@ -11,6 +11,11 @@ include $(TOP)$(ROOT)config/prg.cf
 
 LIB_NAME := $(LIB_PREF)$(LIBNAME)$(LIB_EXT)
 
+#no slash at the end
+LIB_PATH := $(TOP)$(ROOT)lib/$(HB_ARCHITECTURE)
+#no slash at the end
+LIB_DIR := $(LIB_PATH)/$(HB_COMPILER)
+
 LIB_ARCH := $(notdir $(ARCH_DIR))
 ifeq ($(LIB_ARCH),)
 # ARCH_DIR ends with a slash
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index 7f789e7476..c8879361cc 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -33,7 +33,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -47,14 +47,12 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library and other RTLs
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
 
 # screen driver libraries
@@ -93,6 +91,6 @@ LDFLAGS = $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) cr $@ $(^F) && $(RANLIB) $@ || ( $(RM) $@ && false )
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/linux/global.cf b/harbour/config/linux/global.cf
index bbfd0c220c..0a9a017025 100644
--- a/harbour/config/linux/global.cf
+++ b/harbour/config/linux/global.cf
@@ -46,6 +46,8 @@ RANLIB = ranlib
 
 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
+	@[ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)
diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf
index fab71d756e..06c63df23f 100644
--- a/harbour/config/linux/owatcom.cf
+++ b/harbour/config/linux/owatcom.cf
@@ -39,7 +39,7 @@ LDFLAGS = debug all sys Linux OP CASEEXACT
 
 ifeq ($(HB_LIB_COMPILE),)
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib)))
-   LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib))
+   LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
 else
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
@@ -48,7 +48,7 @@ endif
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
    ifeq ($(HB_LIB_COMPILE),)
-      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv))
+      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
    else
       RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv))
    endif
@@ -56,7 +56,7 @@ endif
 
 ifeq ($(findstring rtl,$(LIBS)),rtl)
    ifeq ($(HB_LIB_COMPILE),)
-      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt))
+      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
    else
       GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt))
    endif
@@ -72,6 +72,6 @@ endif
 AR = wlib
 # ARFLAGS = -c -n -fa $(A_USR)
 ARFLAGS = -c -n $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) $@ $(foreach file, $(^F), -+$(file))
+AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file, $(^F), -+$(file))
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 9da2201d55..e49505f14e 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -35,7 +35,7 @@ endif
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -45,7 +45,6 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 # add a last round of rtl/vm to solve positional interdependencies (at the moment hbrun requires this)
 LINKLIBS += -lrtl -lvm -lrtl
@@ -56,13 +55,10 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
 ifeq ($(C_MAIN),)
 ifeq ($(HB_GT_LIB),os2pm)
 # Special handling for PM mode
-LINKPATHS += -L$(TOP)$(ROOT)contrib/hgf/$(HB_GT_LIB)/$(HB_ARCH)
 LINKLIBS += -l$(HB_GT_LIB)
-LINKPATHS += -L$(TOP)$(ROOT)source/rtl/gtos2/$(HB_ARCH)
 LINKLIBS += -lgtos2
 else
 
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 
 endif
@@ -93,8 +89,8 @@ endef
 # We have to use a script to overcome the AR limit of max 850 characters
 # in commmand line
 define create_library
-IF EXIST $@ $(RM) $@
-echo CREATE $@ > __lib__.tmp
+IF EXIST $(LIB_DIR)/$@ $(RM) $(LIB_DIR)/$@
+echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 echo SAVE >> __lib__.tmp
 echo END >> __lib__.tmp
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index 58132ede12..ac66b325fd 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -23,6 +23,8 @@ ifeq ($(SHLVL),) # An OS/2 command shell
 
 ARCH_DIR = $(HB_ARCH)
 OS2_ARCH_DIR = $(subst /,\,$(HB_ARCH))
+OS2_LIB_DIR = $(subst /,\,$(LIB_DIR))
+OS2_LIB_PATH = $(subst /,\,$(LIB_PATH))
 DIRSEP = $(subst /,\,\)
 
 MK = $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -42,11 +44,16 @@ MD = md
 dirbase::
 	-CMD.EXE /c IF NOT EXIST $(HB_ARCHITECTURE) $(MD) $(HB_ARCHITECTURE)
 	-CMD.EXE /c IF NOT EXIST $(OS2_ARCH_DIR)    $(MD) $(OS2_ARCH_DIR)
+	-CMD.EXE /c IF NOT EXIST $(OS2_LIB_PATH)   $(MD) $(OS2_LIB_PATH)
+	-CMD.EXE /c IF NOT EXIST $(OS2_LIB_DIR)    $(MD) $(OS2_LIB_DIR)
 
 clean::
 	-CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)\\*.* $(RM) $(OS2_ARCH_DIR)\\*.*
 	-CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)     $(RD) $(OS2_ARCH_DIR)
 	-CMD.EXE /c IF EXIST $(HB_ARCHITECTURE)  $(RD) $(HB_ARCHITECTURE)
+	-CMD.EXE /c IF EXIST $(OS2_LIB_DIR)\\*.* $(RM) $(OS2_LIB_DIR)\\*.*
+	-CMD.EXE /c IF EXIST $(OS2_LIB_DIR)      $(RD) $(OS2_LIB_DIR)
+	-CMD.EXE /c IF EXIST $(OS2_LIB_PATH)     $(RD) $(OS2_LIB_PATH)
 
 else  # bash
 
@@ -62,8 +69,11 @@ MD = mkdir
 dirbase::
 	@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE); \
 	[ -d $(HB_ARCH) ] || $(MD) $(HB_ARCH)
+	@[ -d $(LIB_PATH) ] || $(MD) $(LIB_PATH); \
+	[ -d $(LIB_DIR) ] || $(MD) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)
 
 endif
diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf
index bbf430adfb..fa4939248b 100644
--- a/harbour/config/os2/icc.cf
+++ b/harbour/config/os2/icc.cf
@@ -31,10 +31,10 @@ endif
 endif
 ifeq ($(HB_LIB_COMPILE),)
 LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
-LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib)$(LIB_EXT))
+LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT))
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(lib)/$(HB_ARCH)/$(lib)$(LIB_EXT))
+LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(LIB_DIR)/$(lib)$(LIB_EXT))
 endif
 else
 LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
@@ -50,10 +50,10 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
 ifeq ($(HB_GT_LIB),os2pm)
 # Special handling for PM mode
 LINKLIBS += $(TOP)$(ROOT)contrib/hgf/$(HB_GT_LIB)/$(HB_ARCH)/$(HB_GT_LIB)$(LIB_EXT)
-LINKLIBS += $(TOP)$(ROOT)source/rtl/gtos2/$(HB_ARCH)/gtos2.lib
+LINKLIBS += $(LIB_DIR)/gtos2.lib
 else
 ifeq ($(HB_LIB_COMPILE),)
-LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)$(LIB_EXT))
+LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)$(LIB_EXT))
 else
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
@@ -72,6 +72,6 @@ endif
 AR = ilib
 ARFLAGS = /NOE /NOIgnoreCase $(A_USR)
 AROBJS = $(foreach file, $(^F), -+$(file))
-AR_RULE = $(AR) $(ARFLAGS) $@ $(AROBJS),,
+AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(AROBJS),,
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index f38b017062..86262cac10 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -27,7 +27,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -36,14 +36,12 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library and other RTLs
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 
 # screen driver libraries
@@ -82,6 +80,6 @@ LDFLAGS = $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) cr $@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/sunos/global.cf b/harbour/config/sunos/global.cf
index aa0018e8c2..d0ab989e63 100644
--- a/harbour/config/sunos/global.cf
+++ b/harbour/config/sunos/global.cf
@@ -46,6 +46,8 @@ MDP = mkdir -p
 
 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
+	@[ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)
diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf
index 405738e8b7..47a9c878ab 100644
--- a/harbour/config/w32/bcc32.cf
+++ b/harbour/config/w32/bcc32.cf
@@ -28,7 +28,7 @@ LD_OUT = -e
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)/contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
-LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)/source/$(lib)/$(HB_ARCH)/$(lib)$(LIB_EXT))
+LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib)$(LIB_EXT))
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(lib)$(LIB_EXT))
@@ -38,7 +38,7 @@ endif
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
 ifeq ($(HB_LIB_COMPILE),)
-LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)/source/rdd/$(drv)/$(HB_ARCH)/$(drv)$(LIB_EXT))
+LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv)$(LIB_EXT))
 else
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
 endif
@@ -47,7 +47,7 @@ endif
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
 ifeq ($(HB_LIB_COMPILE),)
-LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt)$(LIB_EXT))
+LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt)$(LIB_EXT))
 else
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
@@ -76,6 +76,6 @@ LDFLAGS = $(LINKPATHS)
 AR = tlib.exe
 ARFLAGS = $(A_USR)
 AROBJS = $(foreach file, $(^F), -+$(file))
-AR_RULE = $(AR) $(ARFLAGS) $@ $(AROBJS),,
+AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(AROBJS),,
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/w32/cemgw.cf b/harbour/config/w32/cemgw.cf
index ccebd5c714..45f57bc53f 100644
--- a/harbour/config/w32/cemgw.cf
+++ b/harbour/config/w32/cemgw.cf
@@ -23,7 +23,7 @@ LDLIBS =
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -33,13 +33,11 @@ LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LDLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LDLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
 endif
 
@@ -77,7 +75,7 @@ endef
 # We have to use script to overcome the DOS limit of max 128 characters
 # in commmand line
 define create_library
-echo. CREATE $@ > __lib__.tmp
+echo. CREATE $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 echo. SAVE >> __lib__.tmp
 echo. END >> __lib__.tmp
@@ -135,7 +133,7 @@ endif
 endif
 
 ifeq ($(AR_RULE),)
-AR_RULE = $(AR) $(ARFLAGS) cr $@ $(^F) && $(RANLIB) $@ || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR)/$@
 # our libs have a lot of cross referenced now and we have to group them
 # until we won't have cleaned them
 LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)
diff --git a/harbour/config/w32/gcc.cf b/harbour/config/w32/gcc.cf
index 355bcabc05..938acbd35a 100644
--- a/harbour/config/w32/gcc.cf
+++ b/harbour/config/w32/gcc.cf
@@ -21,7 +21,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -38,13 +38,11 @@ LINKLIBS += -luser32 -lwinspool
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 endif
 
@@ -75,6 +73,6 @@ LDFLAGS = $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/w32/global.cf b/harbour/config/w32/global.cf
index 2cc80ff835..9a9d14a0f5 100644
--- a/harbour/config/w32/global.cf
+++ b/harbour/config/w32/global.cf
@@ -33,6 +33,8 @@ ifeq ($(SHLVL),) # COMMAND.COM
 # and some DOS commands require '\' (ARCH_DOS)
 ARCH_DIR = $(subst \,/,$(HB_ARCH))
 ARCH_DOS = $(subst /,\,$(HB_ARCH))
+LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
+LIB_PATH_DOS = $(subst /,\,$(LIB_PATH))
 DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -65,19 +67,26 @@ RD = rmdir /q /s
 dirbase::
 	-@$(COMSPEC) /c \
 	'for %d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %d\. $(MD) %d'
+	-@$(COMSPEC) /c \
+	'for %d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %d\. $(MD) %d'
 
 clean::
 	-@$(COMSPEC) /c \
 	'if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)'
+	-@$(COMSPEC) /c \
+	'if exist $(LIB_DIR_DOS) $(RD) $(LIB_DIR_DOS)'
 
 else # command.com
 
 dirbase::
 	-@for %%d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %%d\nul $(MD) %%d
+	-@for %%d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %%d\nul $(MD) %%d
 
 clean::
 	-@for %%f in ($(ARCH_DOS)\*.* *.bak *.obj *.o *.tds) do $(RM) %%f
 	-@for %%d in ($(ARCH_DOS) $(HB_ARCHITECTURE)) do if exist %%d\nul $(RD) %%d
+	-@for %%f in ($(LIB_DIR_DOS)\*.*) do $(RM) %%f
+	-@for %%d in ($(LIB_DIR_DOS) $(LIB_PATH_DOS)) do if exist %%d\nul $(RD) %%d
 
 endif
 
@@ -95,8 +104,11 @@ MD = mkdir
 dirbase::
 	@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE); \
 	 [ -d $(HB_ARCH) ] || $(MD) $(HB_ARCH)
+	@[ -d $(LIB_PATH) ] || $(MD) $(LIB_PATH); \
+	 [ -d $(LIB_DIR) ] || $(MD) $(LIB_DIR)
 
 clean::
 	-$(RD) $(ARCH_DIR)
+	-$(RD) $(LIB_DIR)/
 
 endif
diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf
index 40f4a3611e..15fd4b91c5 100644
--- a/harbour/config/w32/mingw32.cf
+++ b/harbour/config/w32/mingw32.cf
@@ -23,7 +23,7 @@ LDLIBS =
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -33,7 +33,6 @@ LDLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LDLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
@@ -49,7 +48,6 @@ endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LDLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt))
 endif
 
@@ -85,7 +83,7 @@ endef
 # We have to use script to overcome the DOS limit of max 128 characters
 # in commmand line
 define create_library
-echo. CREATE $@ > __lib__.tmp
+echo. CREATE $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 echo. SAVE >> __lib__.tmp
 echo. END >> __lib__.tmp
@@ -141,7 +139,7 @@ endif
 endif
 
 ifeq ($(AR_RULE),)
-AR_RULE = $(AR) $(ARFLAGS) cr $@ $(^F) && $(RANLIB) $@ || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR)/$@
 # our libs have a lot of cross referenced now and we have to group them
 # until we won't have cleaned them
 LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)
diff --git a/harbour/config/w32/msvc.cf b/harbour/config/w32/msvc.cf
index 935fbf6b5b..3c50e55b80 100644
--- a/harbour/config/w32/msvc.cf
+++ b/harbour/config/w32/msvc.cf
@@ -21,7 +21,7 @@ LD_OUT = -Fe
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += -link $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -link -LIBPATH:$(LIB_DIR)
 else
 LINKPATHS += -link -LIBPATH:$(HB_LIB_COMPILE)
 endif
@@ -30,13 +30,11 @@ LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -LIBPATH:$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -LIBPATH:$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
@@ -44,6 +42,6 @@ LDFLAGS = $(LINKPATHS)
 
 AR = lib.exe
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) /out:$@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/w32/owatcom.cf b/harbour/config/w32/owatcom.cf
index b6ace86338..8a9a7d8399 100644
--- a/harbour/config/w32/owatcom.cf
+++ b/harbour/config/w32/owatcom.cf
@@ -63,7 +63,7 @@ LDFLAGS = debug all OP osn=NT OP stack=65536 OP CASEEXACT
 
 ifeq ($(HB_LIB_COMPILE),)
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib)))
-   LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib))
+   LINKLIBS += $(foreach lib, $(LIBS), $(LIB_DIR)/$(lib))
 else
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(HB_LIB_COMPILE)/$(lib))
    LINKLIBS += $(foreach lib, $(LIBS), $(HB_LIB_COMPILE)/$(lib))
@@ -72,7 +72,7 @@ endif
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
    ifeq ($(HB_LIB_COMPILE),)
-      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv))
+      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
    else
       RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv))
    endif
@@ -80,7 +80,7 @@ endif
 
 ifeq ($(findstring rtl,$(LIBS)),rtl)
    ifeq ($(HB_LIB_COMPILE),)
-      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt))
+      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
    else
       GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt))
    endif
@@ -95,7 +95,7 @@ echo. -+$(file) >> __lib__.tmp
 endef
 
 define create_library
-echo. $@ > __lib__.tmp
+echo. $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 $(AR) $(ARFLAGS) @__lib__.tmp
 endef
diff --git a/harbour/config/w32/pocc.cf b/harbour/config/w32/pocc.cf
index 020b9f5453..fc3139620c 100644
--- a/harbour/config/w32/pocc.cf
+++ b/harbour/config/w32/pocc.cf
@@ -39,7 +39,7 @@ LD_OUT = -OUT:
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -LIBPATH:$(LIB_DIR)
 else
 LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
 endif
@@ -48,17 +48,11 @@ LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-ifeq ($(HB_LIB_COMPILE),)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -LIBPATH:$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
-endif
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-ifeq ($(HB_LIB_COMPILE),)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -LIBPATH:$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
-endif
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
@@ -81,6 +75,6 @@ endif
 
 AR = polib.exe
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) /out:$@ $(^F)
+AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/w32/rsxnt.cf
index 69a6279527..3ba0e2c664 100644
--- a/harbour/config/w32/rsxnt.cf
+++ b/harbour/config/w32/rsxnt.cf
@@ -23,7 +23,7 @@ LD_OUT = -o
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -L$(LIB_DIR)
 else
 LINKPATHS += -L$(HB_LIB_COMPILE)
 endif
@@ -41,13 +41,11 @@ LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl
 endif
 
@@ -78,6 +76,6 @@ LDFLAGS += $(LINKPATHS)
 
 AR = ar
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) r $@ $(^F) || $(RM) $@
+AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/w32/watcom.cf b/harbour/config/w32/watcom.cf
index 0f2222564f..938022cbc3 100644
--- a/harbour/config/w32/watcom.cf
+++ b/harbour/config/w32/watcom.cf
@@ -64,7 +64,7 @@ LDFLAGS = debug all OP osn=NT OP stack=65536 OP CASEEXACT
 
 ifeq ($(HB_LIB_COMPILE),)
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH)/$(subst lib,,$(lib))))
-   LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH)/$(lib)))
+   LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(LIB_DIR)/$(lib)))
 else
    LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
    LINKLIBS += $(foreach lib, $(LIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))
@@ -73,7 +73,7 @@ endif
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
    ifeq ($(HB_LIB_COMPILE),)
-      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH)/$(drv))
+      RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(LIB_DIR)/$(drv))
    else
       RDDLIBS := $(foreach drv, $(HB_DB_DRIVERS), $(HB_LIB_COMPILE)/$(drv))
    endif
@@ -82,7 +82,7 @@ endif
 
 ifeq ($(findstring rtl,$(LIBS)),rtl)
    ifeq ($(HB_LIB_COMPILE),)
-      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH)/$(gt))
+      GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(LIB_DIR)/$(gt))
    else
       GTLIBS := $(foreach gt, $(HB_GT_LIBS), $(HB_LIB_COMPILE)/$(gt))
    endif
@@ -97,8 +97,10 @@ echo. -+$(file) >> __lib__.tmp
 
 endef
 
+LIB_DDIR := $(subst /,\,$(LIB_DIR))
+
 define create_library
-echo. $@ > __lib__.tmp
+echo. $(LIB_DDIR)\$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 $(AR) $(ARFLAGS) @__lib__.tmp
 endef
diff --git a/harbour/config/w32/xcc.cf b/harbour/config/w32/xcc.cf
index 1a119745ea..3f443d8dbf 100644
--- a/harbour/config/w32/xcc.cf
+++ b/harbour/config/w32/xcc.cf
@@ -33,7 +33,7 @@ LD_OUT = -OUT:
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
 LINKPATHS += $(foreach lib, $(CONTRIBS), -LIBPATH:$(TOP)$(ROOT)contrib/$(lib)/$(HB_ARCH))
-LINKPATHS += $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(HB_ARCH))
+LINKPATHS += -LIBPATH:$(LIB_DIR)
 else
 LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE)
 endif
@@ -42,17 +42,11 @@ LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
 
 # If LIBS specifies the rdd library, add all DB drivers.
 ifeq ($(findstring rdd,$(LIBS)),rdd)
-ifeq ($(HB_LIB_COMPILE),)
-LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -LIBPATH:$(TOP)$(ROOT)source/rdd/$(drv)/$(HB_ARCH))
-endif
 LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
 endif
 
 # Add the specified GT driver library
 ifeq ($(findstring rtl,$(LIBS)),rtl)
-ifeq ($(HB_LIB_COMPILE),)
-LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -LIBPATH:$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_ARCH))
-endif
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
@@ -73,6 +67,6 @@ endif
 
 AR = xlib.exe
 ARFLAGS = $(A_USR)
-AR_RULE = $(AR) $(ARFLAGS) /out:$@ $(^F)
+AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/doc/howtosvn.txt b/harbour/doc/howtosvn.txt
index 9d9b5bd5a6..0c8be8e9cc 100644
--- a/harbour/doc/howtosvn.txt
+++ b/harbour/doc/howtosvn.txt
@@ -63,14 +63,16 @@ by Ryszard Glab
     (for example: "SVN update -d >.log"
  3) Resolve all conflicts, run SVN update again (see point 2), recompile
     all sources, fix all errors
- 4) Copy all names of modifed, added or deleted files (files marked with
+ 4) Run SVN STATUS redirecting the output into a file
+    (for example: "svn status >.log"
+ 5) Copy all names of modifed, added or deleted files (files marked with
     'M', 'A' or 'D' flag) from update log into a ChangeLog
- 5) Write necessary comments in the ChangeLog
- 6) Save all your changes from ChangeLog into a file
- 7) Run SVN UPDATE again
- 8) Commit changes running:
+ 6) Write necessary comments in the ChangeLog
+ 7) Save all your changes from ChangeLog into a file
+ 8) Run SVN UPDATE again
+ 9) Commit changes running:
     SVN commit -F file_with_saved_ChangeLog_changes --username sfuser
- 9) Mail file_with_saved_ChangeLog_changes as an email body (do not
+ 10) Mail file_with_saved_ChangeLog_changes as an email body (do not
     send it as an attachment) to the harbour list
 
 Important notes: