From df701b0ac9441d03b6f4ae6f8bcd335f1df3f4bf Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 11 Aug 2009 11:01:08 +0000
Subject: [PATCH] 2009-08-11 13:00 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/bsd/gcc.cf   * config/wce/msvcarm.cf   *
 config/wce/mingwarm.cf   * config/wce/poccarm.cf   * config/hpux/gcc.cf   *
 config/darwin/gcc.cf   * config/dos/djgpp.cf   * config/win/icc.cf   *
 config/win/cygwin.cf   * config/win/msvc.cf   * config/win/xcc.cf   *
 config/win/mingw.cf   * config/win/pocc.cf   * config/win/bcc.cf   *
 config/linux/gcc.cf   * config/linux/icc.cf   * config/linux/sunpro.cf   *
 config/os2/gcc.cf   * config/sunos/gcc.cf   * config/sunos/sunpro.cf     *
 Renamed compiler local internal variable:       LINKPATHS -> LIBPATHS

---
 harbour/ChangeLog              | 26 +++++++++++++++++++++++++-
 harbour/config/bsd/gcc.cf      | 10 +++++-----
 harbour/config/darwin/gcc.cf   |  8 ++++----
 harbour/config/dos/djgpp.cf    |  4 ++--
 harbour/config/hpux/gcc.cf     |  8 ++++----
 harbour/config/linux/gcc.cf    |  8 ++++----
 harbour/config/linux/icc.cf    |  8 ++++----
 harbour/config/linux/sunpro.cf |  6 +++---
 harbour/config/os2/gcc.cf      |  4 ++--
 harbour/config/sunos/gcc.cf    |  8 ++++----
 harbour/config/sunos/sunpro.cf |  6 +++---
 harbour/config/wce/mingwarm.cf |  4 ++--
 harbour/config/wce/msvcarm.cf  |  4 ++--
 harbour/config/wce/poccarm.cf  |  4 ++--
 harbour/config/win/bcc.cf      |  4 ++--
 harbour/config/win/cygwin.cf   |  4 ++--
 harbour/config/win/icc.cf      |  4 ++--
 harbour/config/win/mingw.cf    |  4 ++--
 harbour/config/win/msvc.cf     |  4 ++--
 harbour/config/win/pocc.cf     |  4 ++--
 harbour/config/win/xcc.cf      |  4 ++--
 21 files changed, 80 insertions(+), 56 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 93f69b2a14..88f8eb467b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,30 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-11 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/bsd/gcc.cf
+  * config/wce/msvcarm.cf
+  * config/wce/mingwarm.cf
+  * config/wce/poccarm.cf
+  * config/hpux/gcc.cf
+  * config/darwin/gcc.cf
+  * config/dos/djgpp.cf
+  * config/win/icc.cf
+  * config/win/cygwin.cf
+  * config/win/msvc.cf
+  * config/win/xcc.cf
+  * config/win/mingw.cf
+  * config/win/pocc.cf
+  * config/win/bcc.cf
+  * config/linux/gcc.cf
+  * config/linux/icc.cf
+  * config/linux/sunpro.cf
+  * config/os2/gcc.cf
+  * config/sunos/gcc.cf
+  * config/sunos/sunpro.cf
+    * Renamed compiler local internal variable:
+      LINKPATHS -> LIBPATHS
+
 2009-08-11 12:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/rules.cf
   * config/bsd/gcc.cf
@@ -90,7 +114,7 @@
     % Using := instead of = assignment operator.
     ! Fixed spillage of external LINKPATHS content with some compilers.
     * Non-libpath related variable content moved to LDFLAGS.
-    ; TODO: Rename 'LINKPATHS' to 'LIBPATHS'.
+    ; TODO: Rename 'LINKPATHS' to 'LIBPATHS'. [DONE]
 
 2009-08-11 12:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rtl/fstemp.c
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index 69ef4b1cda..0bccaf288f 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -34,7 +34,7 @@ endif
 LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o
 
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS = $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library and other RTLs
@@ -53,11 +53,11 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-  #LINKPATHS += -L/usr/X11R6/lib64
-   LINKPATHS += -L/usr/X11R6/lib
+  #LIBPATHS += -L/usr/X11R6/lib64
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
-LINKPATHS += -L/usr/local/lib
+LIBPATHS += -L/usr/local/lib
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
    LDLIBS += -lpcre
@@ -69,7 +69,7 @@ endif
 
 LDLIBS += -lm
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 AR := ar
 ARFLAGS :=
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index ce2c3aeef0..a4a56d2ae7 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -47,7 +47,7 @@ endif
 LD := $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 LD_OUT := -o
 
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS = $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library and other RTLs
@@ -66,8 +66,8 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   #LINKPATHS += -L/usr/X11R6/lib64
-   LINKPATHS += -L/usr/X11R6/lib
+   #LIBPATHS += -L/usr/X11R6/lib64
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
@@ -80,7 +80,7 @@ endif
 
 LDLIBS += -lm
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LDLIBS)
 
 AR := libtool
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 47fd31c577..08712014d7 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -34,7 +34,7 @@ endif
 LD := $(HB_CMP)
 LD_OUT := -o
 
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 LDLIBS += -lm
@@ -65,7 +65,7 @@ endef
 define link_exe_file
 @echo. $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$(BIN_DIR)/$@ > __link__.tmp
 $(foreach file,$(^F),$(link_file))
-$(foreach file,$(LINKPATHS),$(link_file))
+$(foreach file,$(LIBPATHS),$(link_file))
 $(foreach file,$(LDLIBS),$(link_file))
 -$(LD) @__link__.tmp
 endef
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index 74de39b40c..635a814a90 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -43,7 +43,7 @@ LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
@@ -58,8 +58,8 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   #LINKPATHS += -L/usr/X11R6/lib64
-   LINKPATHS += -L/usr/X11R6/lib
+   #LIBPATHS += -L/usr/X11R6/lib64
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
@@ -72,7 +72,7 @@ endif
 
 LDLIBS += -lm -lrt
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 AR := ar
 ARFLAGS :=
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index a457c481fe..ed94652450 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -50,7 +50,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
@@ -66,8 +66,8 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   #LINKPATHS += -L/usr/X11R6/lib64
-   LINKPATHS += -L/usr/X11R6/lib
+   #LIBPATHS += -L/usr/X11R6/lib64
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 # HB_GPM_MOUSE: use gpm mouse driver
@@ -85,7 +85,7 @@ endif
 
 LDLIBS += -lm -lrt -ldl
 
-LDFLAGS = $(LINKPATHS)
+LDFLAGS = $(LIBPATHS)
 
 AR := $(HB_CCPREFIX)ar
 ARFLAGS :=
diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf
index ddd2437632..e5af37b6bb 100644
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -42,7 +42,7 @@ LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
@@ -58,8 +58,8 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   #LINKPATHS += -L/usr/X11R6/lib64
-   LINKPATHS += -L/usr/X11R6/lib
+   #LIBPATHS += -L/usr/X11R6/lib64
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 # HB_GPM_MOUSE: use gpm mouse driver
@@ -77,7 +77,7 @@ endif
 
 LDLIBS += -lm -lrt -ldl
 
-LDFLAGS = $(LINKPATHS)
+LDFLAGS = $(LIBPATHS)
 
 AR := xiar
 ARFLAGS :=
diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf
index 45a72ee580..d9cb44a878 100644
--- a/harbour/config/linux/sunpro.cf
+++ b/harbour/config/linux/sunpro.cf
@@ -55,7 +55,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o$(subst x,x, )
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
@@ -70,7 +70,7 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   LINKPATHS += -L/usr/X11R6/lib
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 # HB_GPM_MOUSE: use gpm mouse driver
@@ -88,7 +88,7 @@ endif
 
 LDLIBS += -lm -lrt -ldl
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 AR := $(HB_CCPREFIX)ar
 ARFLAGS :=
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index f03c7db209..7445e28490 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -45,7 +45,7 @@ ifeq ($(C_MAIN),)
 endif
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
@@ -63,7 +63,7 @@ endif
 LDLIBS += -lsocket
 
 # statical linking with GCC 3.2.2 libc as not require its presence on user system
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 ifeq ($(C_MAIN),)
    ifeq ($(HB_GT_LIB),os2pm)
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index fbaf569222..0d2c321a3c 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -41,7 +41,7 @@ LD := $(HB_CCACHE) $(HB_CMP)
 LD_OUT := -o
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
@@ -56,8 +56,8 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   #LINKPATHS += -L/usr/X11R6/lib64
-   LINKPATHS += -L/usr/X11R6/lib
+   #LIBPATHS += -L/usr/X11R6/lib64
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
@@ -71,7 +71,7 @@ endif
 LDLIBS += -lm -lrt
 LDLIBS += -lsocket -lnsl -lresolv
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 AR := ar
 ARFLAGS :=
diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf
index f28940dff9..6a485ace17 100644
--- a/harbour/config/sunos/sunpro.cf
+++ b/harbour/config/sunos/sunpro.cf
@@ -65,7 +65,7 @@ LD := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o$(subst x,x, )
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the specified GT driver library
@@ -80,7 +80,7 @@ ifneq ($(findstring gtsln, $(LIBS)),)
 endif
 ifneq ($(findstring gtxwc, $(LIBS)),)
    LDLIBS += -lX11
-   LINKPATHS += -L/usr/X11R6/lib
+   LIBPATHS += -L/usr/X11R6/lib
 endif
 
 ifneq ($(findstring -DHB_PCRE_REGEX, $(HB_USER_CFLAGS)),)
@@ -94,7 +94,7 @@ endif
 LDLIBS += -lm -lrt
 LDLIBS += -lsocket -lnsl -lresolv
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 AR := ar
 ARFLAGS :=
diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf
index d886d8bff7..1719453b24 100644
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -36,11 +36,11 @@ endif
 LD := $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o
 
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS = $(foreach lib,$(LIBS),-l$(lib))
 
 LDLIBS += -lwininet -lws2
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 RANLIB := $(HB_CCPREFIX)ranlib
 
diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf
index 61634cd19c..6128283b7e 100644
--- a/harbour/config/wce/msvcarm.cf
+++ b/harbour/config/wce/msvcarm.cf
@@ -49,7 +49,7 @@ else
 endif
 LD_OUT := -Fe
 
-LINKPATHS := /libpath:$(LIB_DIR)
+LIBPATHS := /libpath:$(LIB_DIR)
 # Add all libraries specified in LIBS.
 LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 
@@ -59,7 +59,7 @@ LDFLAGS += /nodefaultlib:"kernel32.lib" /align:4096 /opt:ref /opt:icf
 ifeq ($(HB_VISUALC_VER_PRE80),)
    LDFLAGS += /manifest:no
 endif
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 AR := lib.exe
 ARFLAGS :=
diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf
index 7c47736814..86bfc494ab 100644
--- a/harbour/config/wce/poccarm.cf
+++ b/harbour/config/wce/poccarm.cf
@@ -40,10 +40,10 @@ LD := polink.exe
 LD_OUT := -OUT:
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -LIBPATH:$(LIB_DIR)
+LIBPATHS := -LIBPATH:$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib
+LDFLAGS = $(LIBPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib
 LDFLAGS += /SUBSYSTEM:WINDOWS
 
 AR := polib.exe
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index f95073ba4a..2a3fbac631 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -37,12 +37,12 @@ LD := bcc32.exe
 LD_OUT := -e
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 # It's probably not necessary in native Windows but I need it
 # for my Linux box because -L<path> seems to not work with WINE
 LDLIBS = $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 # create library rules
 AR := tlib.exe
diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf
index c9dee840f8..b6b1532d7e 100644
--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -36,14 +36,14 @@ LD := $(HB_CMP)
 LD_OUT := -o
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 
 LDLIBS += $(foreach lib,$(LIBS),-l$(lib))
 
 # This library is needed for CharToOemBuff() and OemToCharBuff() support.
 LDLIBS += -luser32 -lgdi32 -lws2_32
 
-LDFLAGS = $(LINKPATHS)
+LDFLAGS = $(LIBPATHS)
 
 AR := ar
 ARFLAGS :=
diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf
index 00cf791892..d027da9c75 100644
--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -41,10 +41,10 @@ LD := icl.exe
 LD_OUT := -Fe
 
 # Add all libraries specified in LIBS.
-LINKPATHS := /libpath:$(LIB_DIR)
+LIBPATHS := /libpath:$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS = /link $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib
+LDFLAGS = /link $(LIBPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib
 
 AR := xilib.exe
 ARFLAGS :=
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index e160adf7e3..c4655604d5 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -38,7 +38,7 @@ endif
 LD := $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT := -o
 
-LINKPATHS := -L$(LIB_DIR)
+LIBPATHS := -L$(LIB_DIR)
 LDLIBS = $(foreach lib,$(LIBS),-l$(lib))
 
 # Add the standard C main() entry
@@ -50,7 +50,7 @@ endif
 
 LDLIBS += -luser32 -lgdi32 -lws2_32
 
-LDFLAGS += $(LINKPATHS)
+LDFLAGS += $(LIBPATHS)
 
 RANLIB := $(HB_CCPREFIX)ranlib
 
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index 3710f06d6f..3f4bfe3b39 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -52,10 +52,10 @@ LD := link.exe
 LD_OUT := /out:
 
 # Add all libraries specified in LIBS.
-LINKPATHS := /libpath:$(LIB_DIR)
+LIBPATHS := /libpath:$(LIB_DIR)
 LDLIBS = $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS = /nologo $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib
+LDFLAGS = /nologo $(LIBPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib
 
 AR := lib.exe
 ARFLAGS :=
diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf
index d8d8db3f8d..ec62d2a78f 100644
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -37,10 +37,10 @@ LD := polink.exe
 LD_OUT := -OUT:
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -LIBPATH:$(LIB_DIR)
+LIBPATHS := -LIBPATH:$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
+LDFLAGS = $(LIBPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
 LDFLAGS += /SUBSYSTEM:CONSOLE
 
 AR := polib.exe
diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf
index a97bcd9354..31e7d1053b 100644
--- a/harbour/config/win/xcc.cf
+++ b/harbour/config/win/xcc.cf
@@ -31,10 +31,10 @@ LD := xlink.exe
 LD_OUT := -OUT:
 
 # Add all libraries specified in LIBS.
-LINKPATHS := -LIBPATH:$(LIB_DIR)
+LIBPATHS := -LIBPATH:$(LIB_DIR)
 LDLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 
-LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
+LDFLAGS = $(LIBPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
 
 AR := xlib.exe
 ARFLAGS :=