From 911bb802a423d86f0563fa70ce948c33027efe87 Mon Sep 17 00:00:00 2001
From: Lorenzo Fiorini <lorenzo.fiorini@gmail.com>
Date: Thu, 22 Jan 2009 08:31:46 +0000
Subject: [PATCH]

---
 harbour/ChangeLog                  |  6 ++++++
 harbour/bin/hb-mkslib.sh           |  3 ++-
 harbour/source/compiler/hbgenerr.c | 14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 333738df50..55baddd58e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-01-22 09:30 UTC+0100 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
+  * bin/hb-mkslib.sh
+    * fix name of dylibs 
+  * source/compiler/hbgenerr.c
+    * cleaned some ":" in the error messages
+
 2009-01-22 01:08 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com)
   * harbour/contrib/examples/uhttpd/uhttpd.prg
      + Added support for ini file (default: uhttpd.ini)
diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh
index a11f80a99a..319e9c2b4e 100755
--- a/harbour/bin/hb-mkslib.sh
+++ b/harbour/bin/hb-mkslib.sh
@@ -29,6 +29,7 @@ case "$hb_arch" in
     *os/2*)                    hb_arch="os2" ;;
     *dos)                      hb_arch="dos" ;;
     *bsd)                      hb_arch="bsd" ;;
+    *darwin)                   hb_arch="darwin" ;;
 esac
 
 case "$hb_arch" in
@@ -124,7 +125,7 @@ fi
 
 if [ "${SLIB_EXT}" = ".dylib" ]; then
     FULLNAME="${BASE}.${VERSION}${SLIB_EXT}"
-    ${CCPREFIX}libtool -dynamic -install_name "${BASE}.${MAJOR}${SLIB_EXT}" \
+    ${CCPREFIX}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/source/compiler/hbgenerr.c b/harbour/source/compiler/hbgenerr.c
index e7c1d92556..d8873152b1 100644
--- a/harbour/source/compiler/hbgenerr.c
+++ b/harbour/source/compiler/hbgenerr.c
@@ -46,21 +46,21 @@ const char * hb_comp_szErrors[] =
    "NEXT does not match FOR",
    "ELSE does not match IF",
    "ELSEIF does not match IF",
-   "Syntax error: '%s'",
+   "Syntax error '%s'",
    "Unclosed control structure '%s'",
    "%s statement with no loop in sight",
    "Syntax error '%s' in '%s'",
    "Incomplete statement or unbalanced delimiters",
    "Incorrect number of arguments in %s %s",
-   "Invalid lvalue: '%s'",
-   "Invalid use of '@' (pass by reference): '%s'",
+   "Invalid lvalue '%s'",
+   "Invalid use of '@' (pass by reference) '%s'",
    "Formal parameters already declared",
    "Invalid %s from within of SEQUENCE code",
    "Unterminated array index",
    "Could not allocate %s byte(s)",
    "Could not reallocate %s byte(s)",
    "Freeing a NULL memory pointer",
-   "Syntax error: \"%s at '%s'\"",
+   "Syntax error \"%s at '%s'\"",
    "Jump offset too long",
    "Can't create output file '%s'",
    "Can't create preprocessed output file '%s'",
@@ -71,7 +71,7 @@ const char * hb_comp_szErrors[] =
    "Operation not supported for data type '%s'",
    "Invalid alias expression '%s'",
    "Invalid array index expression '%s'",
-   "Bound error: '%s'",
+   "Bound error '%s'",
    "Macro of declared symbol '%s'",
    "Invalid selector '%s' in send",
    "ANNOUNCEd procedure '%s' must be a public symbol",
@@ -135,8 +135,8 @@ const char * hb_comp_szWarnings[] =
    "3Function '%s' conflicting with its declaration",
    "3Variable '%s' used but never initialized",
    "3Value of Variable '%s' never used",
-   "3Incompatible type in assignment to declared array element expected: '%s'",
-   "4Suspicious type in assignment to declared array element expected: '%s'",
+   "3Incompatible type in assignment to declared array element expected '%s'",
+   "4Suspicious type in assignment to declared array element expected '%s'",
    "3Class '%s' not known in declaration of '%s'",
    "3Message '%s' not known in class '%s'",
    "0Meaningless use of expression '%s'",