From b5e40738d22ac97dfb7a38c63ecadeab79989c9c Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 23 Jul 2010 12:02:29 +0000
Subject: [PATCH] 2010-07-23 14:02 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/make.hbs     + Accept package simply as 'hbmylib'. In
 such case it will       use 'hbmylib/hbmylib.hbp' as project file.

---
 harbour/ChangeLog        | 5 +++++
 harbour/contrib/make.hbs | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d2c33ac5fb..b15e1b89d4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-23 14:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    + Accept package simply as 'hbmylib'. In such case it will
+      use 'hbmylib/hbmylib.hbp' as project file.
+
 2010-07-23 13:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     - Deleted handling of .hbi extension.
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 8003c6a089..6e5786e47c 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -156,7 +156,7 @@ PROCEDURE Standalone( ... )
 
          cOptionsUser += " " + tmp
 
-         /* If anything else is passed the options or GNU Make keywords,
+         /* If anything else is passed than options or GNU Make keywords,
             consider it a custom project build, f.e. in tests */
          IF !( Left( tmp, 1 ) == "-" )
             lCustom := .T.
@@ -683,6 +683,12 @@ PROCEDURE AddPkg( hPackageList, cFileName )
    IF ! Empty( cFileName )
 
       hb_FNameSplit( PathSepToSelf( AllTrim( cFileName ) ), @cDir, @cName, @cExt )
+      IF ! Empty( cName ) .AND. Empty( cDir )
+         cDir := cName
+      ENDIF
+      IF Empty( cName )
+         cName := DirGetName( cDir )
+      ENDIF
       IF Empty( cExt )
          cExt := ".hbp"
       ENDIF