From 74ab6485b55b6e8ee4e6b45518e70e601fcc4df6 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 28 May 2010 06:19:26 +0000
Subject: [PATCH] 2010-05-28 08:19 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbwin/hbolesrv.hbc   * utils/hbmk2/hbmk2.prg     *
 Renamed ${hb_filename} macro to ${hb_self}.

  * contrib/hbcomm/hbcomm.prg
    ! Typo in comment.
---
 harbour/ChangeLog                  | 8 ++++++++
 harbour/contrib/hbcomm/hbcomm.prg  | 2 +-
 harbour/contrib/hbwin/hbolesrv.hbc | 2 +-
 harbour/utils/hbmk2/hbmk2.prg      | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c70695854c..519bf3b886 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-28 08:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/hbolesrv.hbc
+  * utils/hbmk2/hbmk2.prg
+    * Renamed ${hb_filename} macro to ${hb_self}.
+
+  * contrib/hbcomm/hbcomm.prg
+    ! Typo in comment.
+
 2010-05-28 08:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added ${hb_filename} macro.
diff --git a/harbour/contrib/hbcomm/hbcomm.prg b/harbour/contrib/hbcomm/hbcomm.prg
index fe288ab31d..3ce0eeb4f1 100644
--- a/harbour/contrib/hbcomm/hbcomm.prg
+++ b/harbour/contrib/hbcomm/hbcomm.prg
@@ -120,7 +120,7 @@ FUNCTION ISWORKING( nPort )
 
 /* NOTE: INCOMPATIBILITY.
          In contratry to original HBCOMM, here <cString> must be passed by reference.
-         HBCOMM could corrupt HVM because of it's buggy way of returning data.
+         HBCOMM could corrupt HVM because of its buggy way of returning data.
          [vszakats] */
 /* Fetch <nCount> chars into <cString> */
 FUNCTION INCHR( nPort, nCount, /* @ */ cString )
diff --git a/harbour/contrib/hbwin/hbolesrv.hbc b/harbour/contrib/hbwin/hbolesrv.hbc
index a123f1c7f7..734a240c88 100644
--- a/harbour/contrib/hbwin/hbolesrv.hbc
+++ b/harbour/contrib/hbwin/hbolesrv.hbc
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-echo={!hbdynvm}Warning: Target must be '-hbdynvm' when using '${hb_filename}'. Input file ignored.
+echo={!hbdynvm}Warning: Target must be '-hbdynvm' when using '${hb_self}'. Input file ignored.
 skip={!hbdynvm}on
 
 libs=hbwin.hbc
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 1173bc7cf0..3483bf1de1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7476,7 +7476,7 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, cMacroPrefix )
          cMacro := FN_NameGet( DirDelPathSep( PathSepToSelf( FN_DirGet( cFileName ) ) ) ) ; EXIT
       CASE "HB_NAME"
          cMacro := PathSepToSelf( FN_NameGet( cFileName ) ) ; EXIT
-      CASE "HB_FILENAME"
+      CASE "HB_SELF"
          cMacro := PathSepToSelf( cFileName ) ; EXIT
       CASE "HB_CURDIR"
          cMacro := hb_pwd() ; EXIT