From a2dda5ada2cd65855ef2a4eacfe73744de3b96d1 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 20 Oct 2010 21:58:15 +0000
Subject: [PATCH] 2010-10-20 23:57 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbcurl/hbcurl.hbc     * Changed to use 'libcurl' as
 implib name also for mingw.       This name will work for the implib
 generated       by Harbour build process. If you want to use something      
 else (f.e. one shipped with a prebuilt libcurl binary release),       update
 the .hbc file locally.

  * utils/hbrun/hbrun.prg
    * Minor stdization in recent output msgs.
---
 harbour/ChangeLog                 | 15 +++++++++++++--
 harbour/contrib/hbcurl/hbcurl.hbc |  3 +--
 harbour/utils/hbrun/hbrun.prg     |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fa107f06a4..0d8f6bc768 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-10-20 23:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbcurl/hbcurl.hbc
+    * Changed to use 'libcurl' as implib name also for mingw.
+      This name will work for the implib generated
+      by Harbour build process. If you want to use something
+      else (f.e. one shipped with a prebuilt libcurl binary release),
+      update the .hbc file locally.
+
+  * utils/hbrun/hbrun.prg
+    * Minor stdization in recent output msgs.
+
 2010-10-20 16:29 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/common/hbtrace.c
     ! fixed to not overwrite user trace settings with default or
@@ -63,8 +74,8 @@
              =>
              hb_vmPushLogical( *reinterpret_cast< bool( * ) >( arguments[ 1 ] ) );
 
-    ! Reimplemented: Francesco's signal management protocol which got broke 
-      due to above overlook.         
+    ! Reimplemented: Francesco's signal management protocol which got broke
+      due to above overlook.
 
 2010-10-20 00:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbziparc/hbziparc.prg
diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/harbour/contrib/hbcurl/hbcurl.hbc
index 0c8b3e8c3d..4fe889534a 100644
--- a/harbour/contrib/hbcurl/hbcurl.hbc
+++ b/harbour/contrib/hbcurl/hbcurl.hbc
@@ -8,8 +8,7 @@ incpaths=.
 {HB_STATIC_CURL}libs=${hb_name}s${__HB_DYN__}
 
 {!allwin}libs=curl
-{ allwin&!HB_STATIC_CURL&!allmingw}libs=libcurl
-{ allwin&!HB_STATIC_CURL& allmingw}libs=curldll
+{ allwin&!HB_STATIC_CURL}libs=libcurl
 { allwin& HB_STATIC_CURL&!allmingw}libs=libcurl libssh2
 { allwin& HB_STATIC_CURL& allmingw}libs=curl ssh2
 
diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg
index 0655b28fe6..54e2b80fbb 100644
--- a/harbour/utils/hbrun/hbrun.prg
+++ b/harbour/utils/hbrun/hbrun.prg
@@ -119,7 +119,7 @@ PROCEDURE _APPMAIN( cFile, ... )
             IF win_reg( .T., Right( Lower( cFile ), 1 ) == "a" )
                OutStd( "hbrun: Harbour Script File registered" + hb_eol() )
             ELSE
-               OutErr( "hbrun: Error registering Harbour Script File" + hb_eol() )
+               OutErr( "hbrun: Error: Registering Harbour Script File" + hb_eol() )
             ENDIF
             EXIT
          CASE "-u"
@@ -129,7 +129,7 @@ PROCEDURE _APPMAIN( cFile, ... )
             IF win_reg( .F., Right( Lower( cFile ), 1 ) == "a" )
                OutStd( "hbrun: Harbour Script File unregistered" + hb_eol() )
             ELSE
-               OutErr( "hbrun: Error unregistering Harbour Script File" + hb_eol() )
+               OutErr( "hbrun: Error: Unregistering Harbour Script File" + hb_eol() )
             ENDIF
             EXIT
 #endif