From d51a2936eb9baf8039896aca104ab8f2b70fabda Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 24 Aug 2009 15:11:39 +0000
Subject: [PATCH] 2009-08-24 17:10 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-mkdyn.sh   *
 harbour/bin/postinst.sh     ! fixed win and wce cross builds when GCC cross
 build tools are not       in PATH

---
 harbour/ChangeLog       | 6 ++++++
 harbour/bin/hb-mkdyn.sh | 7 ++++---
 harbour/bin/postinst.sh | 5 +++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b23aef087f..8dd292d927 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-24 17:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-mkdyn.sh
+  * harbour/bin/postinst.sh
+    ! fixed win and wce cross builds when GCC cross build tools are not
+      in PATH
+
 2009-08-24 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/global.mk
     ! fixed MinGW cross build autodetection
diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh
index 4fa7ef6ca5..7089c8eb25 100755
--- a/harbour/bin/hb-mkdyn.sh
+++ b/harbour/bin/hb-mkdyn.sh
@@ -14,6 +14,7 @@
 
 # HB_PLATFORM=""
 # HB_CCPREFIX=""
+# HB_CCPATH=""
 
 if [ -n "${HB_PLATFORM}" ]
 then
@@ -111,7 +112,7 @@ if [ "${SLIB_EXT}" != ".dylib" ]; then
                 d="${f##*/}"
                 mkdir $d
                 cd $d
-                ${HB_CCPREFIX}ar -x "${f}" || exit 1
+                ${HB_CCPATH}${HB_CCPREFIX}ar -x "${f}" || exit 1
                 cd ..
                 ;;
             *)
@@ -139,7 +140,7 @@ elif [ "${SLIB_EXT}" = ".dll" ]; then
         SYSLIBS="-luser32 -lws2_32 -ladvapi32 -lgdi32"
     fi
     # -Wl,--output-def,testdll.def,--out-implib,libtestdll.a
-    ${HB_CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_DFLAGS} ${SYSLIBS} ${HB_DLLIBS} && \
+    ${HB_CCPATH}${HB_CCPREFIX}gcc -shared -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_DFLAGS} ${SYSLIBS} ${HB_DLLIBS} && \
         cd "${dir}" && \
         rm -f "${DSTDIR}${FULLNAME}" && \
         mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}"
@@ -147,7 +148,7 @@ else
     #FULLNAME="${BASE}-${VERSION}${SLIB_EXT}"
     #FULLNAME="${BASE}{SLIB_EXT}.${VERSION}"
     FULLNAME="${LIB_NAME}${SLIB_EXT}"
-    ${HB_CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_DFLAGS} && \
+    ${HB_CCPATH}${HB_CCPREFIX}gcc -shared -fPIC -o "${FULLNAME}" $OBJLST ${linker_options} ${HB_USER_DFLAGS} && \
         cd "${dir}" && \
         mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}"
 fi
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index d310e4d37b..9108eaf534 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -52,8 +52,9 @@ then
     if [ -n "${HB_TOOLS_PREF}" ]; then
         hb_mkdyn="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkdyn"
         rm -f "${hb_mkdyn}"
-        sed -e "s/^# HB_PLATFORM=\"\"\$/HB_PLATFORM=\"${HB_PLATFORM}\"/g" \
-            -e "s/^# HB_CCPREFIX=\"\"\$/[ -n \"\${HB_CCPREFIX}\" ] || HB_CCPREFIX=\"${HB_CCPREFIX}\"/g" \
+        sed -e "s!^# HB_PLATFORM=\"\"\$!HB_PLATFORM=\"${HB_PLATFORM}\"!g" \
+            -e "s!^# HB_CCPREFIX=\"\"\$![ -n \"\${HB_CCPREFIX}\" ] || HB_CCPREFIX=\"${HB_CCPREFIX}\"!g" \
+            -e "s!^# HB_CCPATH=\"\"\$![ -n \"\${HB_CCPATH}\" ] || HB_CCPATH=\"${HB_CCPATH}\"!g" \
             "${hb_root}/bin/hb-mkdyn.sh" > "${hb_mkdyn}" && \
         chmod 755 "${hb_mkdyn}"
     elif [ "$HB_COMPILER" = "icc" ]; then