From 945c26d396ebbd61498aa2e888efb2c622bfd7eb Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 17 Jul 2009 07:05:54 +0000
Subject: [PATCH] 2009-07-17 09:01 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * make_gnu.sh     ! Changed to use gmake on all sunos systems.

  * utils/hbmk2/hbmk2.prg
  * config/sunos/gcc.cf
    ! Added space after -o CC option. Required by some sunos systems.

  ; Thanks for valuable input and testing to Tamas Tevesz.
---
 harbour/ChangeLog             | 10 ++++++++++
 harbour/config/sunos/gcc.cf   |  5 ++++-
 harbour/make_gnu.sh           | 14 ++++++++------
 harbour/utils/hbmk2/hbmk2.prg |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f5a22394f3..b64805da84 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-17 09:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * make_gnu.sh
+    ! Changed to use gmake on all sunos systems.
+
+  * utils/hbmk2/hbmk2.prg
+  * config/sunos/gcc.cf
+    ! Added space after -o CC option. Required by some sunos systems.
+
+  ; Thanks for valuable input and testing to Tamas Tevesz.
+
 2009-07-17 02:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/instsh.cf
     * shell/nt rule $(MD) -> $(MDP). (just for clarity)
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index 513114949e..199fb08b8e 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -15,7 +15,10 @@ LIB_EXT = .a
 
 CC = $(HB_CCACHE) $(HB_CMP)
 CC_IN = -c
-CC_OUT = -o
+# NOTE: The ending space after -o is important, please preserve it.
+#       Now solved with '$(subst x,x, )' expression.
+CC_OUT = -o$(subst x,x, )
+
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 
 CFLAGS =
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index 7c30b8014f..df7eb7fd08 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -157,12 +157,14 @@ else
     # ---------------------------------------------------------------
     # Start the GNU make system
 
-    if [ "$HB_ARCHITECTURE" = "bsd" ] || [ "$HB_ARCHITECTURE" = "hpux" ]
-    then
-       gmake $HB_USER_MAKEFLAGS $*
-    else
-       make $HB_USER_MAKEFLAGS $*
-    fi
+    case "$HB_ARCHITECTURE" in
+        bsd|hpux|sunos)
+            gmake $HB_USER_MAKEFLAGS $*
+            ;;
+        *)
+            make $HB_USER_MAKEFLAGS $*
+            ;;
+    esac
 
     if [ "$*" = "clean" ]; then
        find . -type d -name "$HB_ARCHITECTURE" | xargs rmdir 2> /dev/null
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 0c60ada4b1..ab520fdef4 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2135,14 +2135,14 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          ENDIF
          IF lStopAfterCComp
             IF ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
-               IF hbmk[ _HBMK_cARCH ] == "darwin"
+               IF hbmk[ _HBMK_cARCH ] $ "darwin|sunos"
                   AAdd( hbmk[ _HBMK_aOPTC ], "-o {OO}" )
                ELSE
                   AAdd( hbmk[ _HBMK_aOPTC ], "-o{OO}" )
                ENDIF
             ENDIF
          ELSE
-            IF hbmk[ _HBMK_cARCH ] == "darwin"
+            IF hbmk[ _HBMK_cARCH ] $ "darwin|sunos"
                AAdd( hbmk[ _HBMK_aOPTL ], "-o {OE}" )
             ELSE
                AAdd( hbmk[ _HBMK_aOPTL ], "-o{OE}" )