From 56fac2097fd24cd454227e0d6875b3750c4148b2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 7 Aug 2011 17:34:32 +0000
Subject: [PATCH] 2011-08-07 19:33 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     + better accept libs passed as names
 in oldschool 'name.lib' format   * src/rtl/objfunc.prg     * casing

---
 harbour/ChangeLog             |  6 ++++++
 harbour/src/rtl/objfunc.prg   |  2 +-
 harbour/utils/hbmk2/hbmk2.prg | 10 ++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 74b6895112..5cf9f36e17 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-08-07 19:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + better accept libs passed as names in oldschool 'name.lib' format
+  * src/rtl/objfunc.prg
+    * casing
+
 2011-08-05 19:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbclass.ch
     ! typo in VO specific (inactive) section: HIDDE -> HIDDEN
diff --git a/harbour/src/rtl/objfunc.prg b/harbour/src/rtl/objfunc.prg
index 0a5357f5be..626be88cbc 100644
--- a/harbour/src/rtl/objfunc.prg
+++ b/harbour/src/rtl/objfunc.prg
@@ -167,7 +167,7 @@ FUNCTION __objGetValueList( oObject, aExcept )
 
    RETURN aData
 
-FUNCTION __ObjSetValueList( oObject, aData )
+FUNCTION __objSetValueList( oObject, aData )
 
    IF ! ISOBJECT( oObject )
       __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) )
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 9d10479c50..5ac2b3fd4e 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2892,6 +2892,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
            ( ! Empty( hbmk[ _HBMK_cDynLibExt ] ) .AND. hb_FNameExt( cParamL ) == hbmk[ _HBMK_cDynLibExt ] )
 
          cParam := PathSepToSelf( cParam )
+         IF hb_FNameExt( cParamL ) == ".lib"
+            cParam := FNameDirName( cParam )
+         ENDIF
          IF _IS_AUTOLIBSYSPRE( cParam )
             AAdd( hbmk[ _HBMK_aLIBUSERSYSPRE ], cParam )
          ELSE
@@ -8997,6 +9000,13 @@ STATIC FUNCTION FNameNameGetNoExt( cFileName )
 
    RETURN cName
 
+STATIC FUNCTION FNameDirName( cFileName )
+   LOCAL cDir, cName
+
+   hb_FNameSplit( cFileName, @cDir, @cName )
+
+   RETURN hb_FNameMerge( cDir, cName )
+
 STATIC FUNCTION FNameDirExtSet( cFileName, cDirNew, cExtNew )
    LOCAL cDir, cName, cExt