From 282af2d41b50f40edd0cf77d15e74d3beb486d81 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 17 Aug 2009 20:49:20 +0000
Subject: [PATCH] 2009-08-17 22:47 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk     ! Fixed previous commit after actual
 testing.       Now wce cross build on linux works by simply setting HB_CCPATH
       and issuing 'make'.     ; TODO: Extend above logic to other *nix
 platforms.

---
 harbour/ChangeLog        |  7 +++++++
 harbour/config/global.mk | 14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6482940e91..241c035181 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-17 22:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    ! Fixed previous commit after actual testing.
+      Now wce cross build on linux works by simply setting HB_CCPATH
+      and issuing 'make'.
+    ; TODO: Extend above logic to other *nix platforms.
+
 2009-08-17 21:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * config/wce/mingwarm.mk
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 0a16e4717e..eb6440cdc8 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -53,6 +53,10 @@ define find_in_path
 $(strip $(foreach dir,$(subst $(PTHSEP), ,$(PATH)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
 endef
 
+define find_in_path_par
+$(strip $(foreach dir,$(subst $(PTHSEP), ,$(2)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
+endef
+
 define check_host
 
 ifneq ($(findstring MINGW,$(1)),)
@@ -534,25 +538,24 @@ ifeq ($(HB_COMPILER),)
             endif
          endif
       endif
-      export HB_CCPREFIX
    else
       ifeq ($(HB_ARCHITECTURE),linux)
-         ifneq ($(strip $(wildcard $(HB_CCPATH)/arm-wince-mingw32ce-gcc$(HB_HOST_BIN_EXT)))),)
+         ifneq ($(call find_in_path_par,arm-wince-mingw32ce-gcc,$(HB_CCPATH)),)
             HB_COMPILER := mingwarm
             HB_ARCHITECTURE := wce
             HB_CCPREFIX := arm-wince-mingw32ce-
-            HB_CCPATH += /
+            HB_CCPATH := $(HB_CCPATH)/
             export HB_TOOLS_PREF := hbce
             export HB_XBUILD := wce
             ifneq ($(HB_HOST_BUILD),all)
                HB_HOST_BUILD := lib
             endif
          else
-            ifneq ($(strip $(wildcard $(HB_CCPATH)/arm-mingw32ce-gcc$(HB_HOST_BIN_EXT)))),)
+            ifneq ($(call find_in_path_par,arm-mingw32ce-gcc,$(HB_CCPATH)),)
                HB_COMPILER := mingwarm
                HB_ARCHITECTURE := wce
                HB_CCPREFIX := arm-mingw32ce-
-               HB_CCPATH += /
+               HB_CCPATH := $(HB_CCPATH)/
                export HB_TOOLS_PREF := hbce
                export HB_XBUILD := wce
                ifneq ($(HB_HOST_BUILD),all)
@@ -611,6 +614,7 @@ ifeq ($(HB_COMPILER),)
    ifneq ($(HB_COMPILER),)
       HB_COMP_AUTO := (autodetected)
    endif
+   export HB_CCPREFIX
 endif
 
 ifeq ($(HB_ARCHITECTURE),)