From 8bf621c28eb2fa0810e2919371e96e6c335f1a43 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 8 Apr 2009 01:36:02 +0000
Subject: [PATCH] 2009-04-08 03:35 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * utils/hbmk2/hbmk2.prg     ! Possible fix for *nix shared lib problem
 when Harbour       is installed in system location. Couldn't test it.     *
 ar now called with 'rcs' parameter (was: cr).       Advertized as runlib
 equivalent, but it doesn't seem to       make any difference.

---
 harbour/ChangeLog             | 8 ++++++++
 harbour/utils/hbmk2/hbmk2.prg | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6a50a5eca3..21660fd57b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-08 03:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Possible fix for *nix shared lib problem when Harbour
+      is installed in system location. Couldn't test it.
+    * ar now called with 'rcs' parameter (was: cr).
+      Advertized as runlib equivalent, but it doesn't seem to
+      make any difference.
+
 2009-04-08 02:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed bug in yesterday's changes.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 422b51d84d..383392c502 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1227,6 +1227,9 @@ PROCEDURE Main( ... )
 
       DO CASE
       CASE t_cARCH $ "bsd|linux|hpux|sunos" .OR. t_cARCH == "darwin" /* Separated to avoid match with 'win' */
+         IF Empty( cPrefix )
+            cDynLibNamePrefix := ""
+         ENDIF
          s_aLIBSHARED := { iif( s_lMT, cPrefix + cDynLibNamePrefix + "harbourmt" + cPostfix + cDynLibExt,;
                                        cPrefix + cDynLibNamePrefix + "harbour"   + cPostfix + cDynLibExt ) }
       CASE t_cARCH $ "os2|win|wce"
@@ -1287,7 +1290,7 @@ PROCEDURE Main( ... )
          cLibExt := ""
          cObjExt := ".o"
          cBin_Lib := t_cCCPREFIX + "ar"
-         cOpt_Lib := "{FA} cr {OL} {LO}"
+         cOpt_Lib := "{FA} rcs {OL} {LO}"
          cBin_CompC := t_cCCPREFIX + iif( t_cCOMP == "gpp" .OR. s_lCPP, "g++", "gcc" )
          IF ! Empty( t_cCCPATH )
             cBin_Lib   := t_cCCPATH + "/" + cBin_Lib
@@ -1429,7 +1432,7 @@ PROCEDURE Main( ... )
          cLibPathSep := " "
          cLibLibExt := ".a"
          cBin_Lib := t_cCCPREFIX + "ar.exe"
-         cOpt_Lib := "{FA} cr {OL} {LO}"
+         cOpt_Lib := "{FA} rcs {OL} {LO}"
          cLibObjPrefix := NIL
          IF ! Empty( t_cCCPATH )
             cBin_Lib   := t_cCCPATH + "\" + cBin_Lib