From eb6f760f4306d3c10dcb8b2fcd253b515e06b20e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 14 May 2010 22:11:04 +0000
Subject: [PATCH] 2010-05-15 00:07 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk     ! Fixed problem caused by $(wildcard) not
 matching existing       files when using '/dir//file' format (note double
 slash).       So f.e. it caused autodetection to fail when dir was      
 speficied as 'C:\mingw\bin\' (with ending backslash) in PATH.       It's good
 to remove such backslashes anyway, but from now       on it won't cause
 problem for Harbour build system.

---
 harbour/ChangeLog        | 9 +++++++++
 harbour/config/global.mk | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f3c19576b3..cbca718c92 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-15 00:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    ! Fixed problem caused by $(wildcard) not matching existing
+      files when using '/dir//file' format (note double slash).
+      So f.e. it caused autodetection to fail when dir was
+      speficied as 'C:\mingw\bin\' (with ending backslash) in PATH.
+      It's good to remove such backslashes anyway, but from now
+      on it won't cause problem for Harbour build system.
+
 2010-05-14 23:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/tget.prg
     ! Fixed "@RE" picture mask handling in GETs.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 02e18e439f..419a8cf82a 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -56,9 +56,9 @@ ifeq ($(filter $(_make_ver_min),$(firstword $(sort $(MAKE_VERSION) $(_make_ver_m
    $(error ! Error: GNU Make version $(MAKE_VERSION) found, $(_make_ver_min) or upper needed for Harbour)
 endif
 
-find_in_path     = $(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),$(substpat),$(PATH))), $(wildcard $(subst $(substpat),\ ,$(subst \,/,$(dir)))/$(1)$(HB_HOST_BIN_EXT))))
-find_in_path_par = $(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),$(substpat),$(2))), $(wildcard $(subst $(substpat),\ ,$(subst \,/,$(dir)))/$(1)$(HB_HOST_BIN_EXT))))
-find_in_path_raw = $(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),$(substpat),$(2))), $(wildcard $(subst $(substpat),\ ,$(subst \,/,$(dir)))/$(1))))
+find_in_path     = $(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),$(substpat),$(PATH))), $(wildcard $(subst //,/,$(subst $(substpat),\ ,$(subst \,/,$(dir)))/$(1))$(HB_HOST_BIN_EXT))))
+find_in_path_par = $(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),$(substpat),$(2))), $(wildcard $(subst //,/,$(subst $(substpat),\ ,$(subst \,/,$(dir)))/$(1))$(HB_HOST_BIN_EXT))))
+find_in_path_raw = $(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),$(substpat),$(2))), $(wildcard $(subst //,/,$(subst $(substpat),\ ,$(subst \,/,$(dir)))/$(1)))))
 
 define detect_watcom_platform
    ifneq ($(call find_in_path_raw,os2.h,$(INCLUDE)),)