From cebc3f89975c4df6d5cc847e9dffdcaf77a6f657 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 19 Jun 2009 13:15:14 +0000
Subject: [PATCH] 2009-06-19 15:14 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * bin/hb-mkdyn.sh     ! Fixed to not use HB_CCPREFIX for libtool
 command.

  * utils/hbmk2/hbmk2.prg
    ! Fixed typo in libtool cmd.

  * ChangeLog
    * Items marked DONE.
---
 harbour/ChangeLog             | 16 +++++++++++++---
 harbour/bin/hb-mkdyn.sh       |  2 +-
 harbour/utils/hbmk2/hbmk2.prg |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 49eef5ae7c..7d140e159a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-19 15:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/hb-mkdyn.sh
+    ! Fixed to not use HB_CCPREFIX for libtool command.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed typo in libtool cmd.
+
+  * ChangeLog
+    * Items marked DONE.
+
 2009-06-19 15:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/darwin/gcc.cf
     * Changed to use 'gcc' as compiler name like on other platforms
@@ -139,7 +149,7 @@
 2009-06-19 00:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/vm/runner.c
     * Formatted.
-    ; TOFIX:
+    ; TOFIX: [DONE]
         ../../runner.c: In function 'hb_hrbLoad':
         ../../runner.c:413: error: '_HB_SYMB' undeclared (first use in this function)
         ../../runner.c:413: error: (Each undeclared identifier is reported only once
@@ -288,7 +298,7 @@
     * Updated STOD() content with core code.
     ; TOFIX: ? Probably it would be best to remove this function
              from here, otherwise it may just create syncing
-             problems. Also from xpp lib. Opinions?
+             problems. Also from xpp lib. Opinions? [DONE]
 
   * contrib/xpp/xpp.ch
     + Now defining HB_COMPAT_XPP. This can be helpful to enable
@@ -807,7 +817,7 @@
 
   * contrib/rddado/tests/access1.prg
     * Minor formatting.
-    ; TOFIX: Does't work:
+    ; TOFIX: Doesn't work:
       ---
       Error BASE/3012  Argument error: OPEN
       Called from WIN_OLEAUTO:OPEN(0)
diff --git a/harbour/bin/hb-mkdyn.sh b/harbour/bin/hb-mkdyn.sh
index 482c7fbcf3..6e607ac62a 100755
--- a/harbour/bin/hb-mkdyn.sh
+++ b/harbour/bin/hb-mkdyn.sh
@@ -125,7 +125,7 @@ fi
 
 if [ "${SLIB_EXT}" = ".dylib" ]; then
     FULLNAME="${BASE}.${VERSION}${SLIB_EXT}"
-    ${HB_CCPREFIX}libtool -dynamic -install_name "${BASE}${SLIB_EXT}" \
+    libtool -dynamic -install_name "${BASE}${SLIB_EXT}" \
         -compatibility_version ${MAJOR}.${MINOR} -current_version ${VERSION} \
         -flat_namespace -undefined warning -multiply_defined suppress -single_module \
         -o "${DSTDIR}/${FULLNAME}" "$@" && \
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 11fb8d35f5..7d46549a54 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2013,7 +2013,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          cObjExt := ".o"
          IF hbmk[ _HBMK_cARCH ] == "darwin"
             cBin_Lib := "libtool"
-            cOpt_Lib := "-static {FA} -o {LO} {OL}"
+            cOpt_Lib := "-static {FA} -o {OL} {LO}"
          ELSE
             cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "ar"
             cOpt_Lib := "{FA} rcs {OL} {LO}"