From e08c112c2d2b5f5d2a9f0b1d07167c5566bf6e9c Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Sat, 23 May 2009 09:04:55 +0000
Subject: [PATCH] 2009-05-23 11:13 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-func.sh     * reduce the scope of
 default options in hbmk.cfg to given platform       and compiler {arch&comp}.
 Viktor please verify it.

---
 harbour/ChangeLog      |  5 +++++
 harbour/bin/hb-func.sh | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6308fbe009..2aeb4ff755 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-23 11:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * reduce the scope of default options in hbmk.cfg to given platform
+      and compiler {arch&comp}. Viktor please verify it.
+
 2009-05-22 22:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     % mingw tool extensions now again have ".exe" extension, but
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 00f2878ffb..1b750714de 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -119,7 +119,7 @@ mk_hbgetlibsctb()
 
 mk_hbtools()
 {
-    local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_gt_ori
+    local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_mkdef hb_gt_ori
 
     name=`get_solibname`
     hb_pref="$4"
@@ -238,34 +238,35 @@ mk_hbtools()
     fi
 
     hb_hbmkcfg="$1/hbmk.cfg"
+    hb_mkdef="{${HB_ARCHITECTURE}&${HB_COMPILER}}"
     echo "Generating ${hb_hbmkcfg}... "
     echo "# Harbour Make configuration"> ${hb_hbmkcfg}
     echo "# Generated by Harbour build process">> ${hb_hbmkcfg}
     echo "arch=${HB_ARCHITECTURE}">> ${hb_hbmkcfg}
-    echo "comp=${HB_COMPILER}">> ${hb_hbmkcfg}
+    echo "comp={${HB_ARCHITECTURE}}${HB_COMPILER}">> ${hb_hbmkcfg}
     if [ -n "${hb_gt_ori}" ]; then
-        echo "gtdef=${hb_gt_ori}">> ${hb_hbmkcfg}
+        echo "gtdef=${hb_mkdef}${hb_gt_ori}">> ${hb_hbmkcfg}
     fi
     if [ -n "${CC_HB_USER_CFLAGS}" ]; then
-        echo "cflags=${CC_HB_USER_CFLAGS}">> ${hb_hbmkcfg}
+        echo "cflags=${hb_mkdef}${CC_HB_USER_CFLAGS}">> ${hb_hbmkcfg}
     fi
     if [ -n "${CC_HB_USER_LDFLAGS}" ]; then
-        echo "ldflags=${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg}
+        echo "ldflags=${hb_mkdef}${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg}
     fi
     if [ -n "${CC_HB_USER_LIBS}" ]; then
-        echo "libs=${CC_HB_USER_LIBS}">> ${hb_hbmkcfg}
+        echo "libs=${hb_mkdef}${CC_HB_USER_LIBS}">> ${hb_hbmkcfg}
     fi
     if [ "${HB_GPM_MOUSE}" = "yes" ]; then
-        echo "libs=gpm">> ${hb_hbmkcfg}
+        echo "libs=${hb_mkdef}gpm">> ${hb_hbmkcfg}
     fi
     if [ "${HB_WITHOUT_X11}" != "yes" ]; then
-        echo "libdynhas=gtxwc">> ${hb_hbmkcfg}
+        echo "libdynhas=${hb_mkdef}gtxwc">> ${hb_hbmkcfg}
     fi
     if [ "${HB_WITHOUT_GTCRS}" != "yes" ] && [ -n "${HB_CRS_LIB}" ]; then
-        echo "libdynhas=gtcrs">> ${hb_hbmkcfg}
+        echo "libdynhas=${hb_mkdef}gtcrs">> ${hb_hbmkcfg}
     fi
     if [ "${HB_WITHOUT_GTSLN}" != "yes" ] && [ -n "${HB_SLN_LIB}" ]; then
-        echo "libdynhas=gtsln">> ${hb_hbmkcfg}
+        echo "libdynhas=${hb_mkdef}gtsln">> ${hb_hbmkcfg}
     fi
 
     echo "Generating ${hb_tool}... "