From e41a36f2bf9a82e631f81e9559eeb3ae05cc454c Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 28 Jun 2010 19:40:20 +0000
Subject: [PATCH] 2010-06-28 21:37 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbformat/Makefile   * utils/hbi18n/Makefile   *
 utils/hbtest/Makefile     ! Fixed to not try to build shared binaries if
 HB_BUILD_DLL=no.

  * utils/hbmk2/hbmk2.prg
  * utils/hbrun/hbrun.prg
    + Recognized .hbs as extension equivalent to .prg.
      .hbs means: Harbour Script
---
 harbour/ChangeLog               | 11 +++++++++++
 harbour/utils/hbformat/Makefile |  4 +++-
 harbour/utils/hbi18n/Makefile   |  4 +++-
 harbour/utils/hbmk2/hbmk2.prg   |  4 +++-
 harbour/utils/hbrun/hbrun.prg   |  2 ++
 harbour/utils/hbtest/Makefile   |  4 +++-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 034cd4281b..df9dc01834 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-28 21:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbformat/Makefile
+  * utils/hbi18n/Makefile
+  * utils/hbtest/Makefile
+    ! Fixed to not try to build shared binaries if HB_BUILD_DLL=no.
+
+  * utils/hbmk2/hbmk2.prg
+  * utils/hbrun/hbrun.prg
+    + Recognized .hbs as extension equivalent to .prg.
+      .hbs means: Harbour Script
+
 2010-06-28 21:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbmk2_plugin_ui.prg
     * Further cleanup.
diff --git a/harbour/utils/hbformat/Makefile b/harbour/utils/hbformat/Makefile
index 5d19454349..88a4bc72db 100644
--- a/harbour/utils/hbformat/Makefile
+++ b/harbour/utils/hbformat/Makefile
@@ -15,7 +15,9 @@ PRG_MAIN := hbformat.prg
 LIBS = $(HB_LIBS_ST_NORDD)
 
 ifneq ($(filter $(HB_PLATFORM),win wce os2),)
-   HB_BUILD_SHARED := yes
+   ifneq ($(HB_BUILD_DLL),no)
+      HB_BUILD_SHARED := yes
+   endif
 endif
 
 include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbi18n/Makefile b/harbour/utils/hbi18n/Makefile
index 71848f6d04..0bbeb7cd39 100644
--- a/harbour/utils/hbi18n/Makefile
+++ b/harbour/utils/hbi18n/Makefile
@@ -12,7 +12,9 @@ PRG_MAIN := hbi18n.prg
 LIBS = $(HB_LIBS_ST_NORDD)
 
 ifneq ($(filter $(HB_PLATFORM),win wce os2),)
-   HB_BUILD_SHARED := yes
+   ifneq ($(HB_BUILD_DLL),no)
+      HB_BUILD_SHARED := yes
+   endif
 endif
 
 include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 74c066e7d0..851ddcf2b1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6491,7 +6491,9 @@ STATIC PROCEDURE PlugIn_Load( hbmk )
 
       IF ! Empty( cFile )
          lOK := .F.
-         IF !( Lower( cExt ) == ".prg" ) /* Optimization: Don't try to load it as .hrb if the extension is .prg */
+         /* Optimization: Don't try to load it as .hrb if the extension is .prg or .hbs (Harbour script) */
+         IF !( Lower( cExt ) == ".prg" ) .AND. ;
+            !( Lower( cExt ) == ".hbs" )
             BEGIN SEQUENCE WITH {| oError | Break( oError ) }
                hrb := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile )
                cType := I_( "(compiled)" )
diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg
index 4a0dcbd75b..a650009c1c 100644
--- a/harbour/utils/hbrun/hbrun.prg
+++ b/harbour/utils/hbrun/hbrun.prg
@@ -110,6 +110,7 @@ PROCEDURE _APPMAIN( cFile, ... )
             cExt := lower( cExt )
             SWITCH cExt
                CASE ".prg"
+               CASE ".hbs"
                CASE ".hrb"
                CASE ".dbf"
                   EXIT
@@ -121,6 +122,7 @@ PROCEDURE _APPMAIN( cFile, ... )
                   HB_DotPrompt( "USE " + cFile )
                   EXIT
                CASE ".prg"
+               CASE ".hbs"
                   cFile := HB_COMPILEBUF( HB_ARGV( 0 ), "-n2", "-w", "-es2", "-q0", ;
                                           s_aIncDir, cFile )
                   IF cFile == NIL
diff --git a/harbour/utils/hbtest/Makefile b/harbour/utils/hbtest/Makefile
index 130af02bb0..1de62babfd 100644
--- a/harbour/utils/hbtest/Makefile
+++ b/harbour/utils/hbtest/Makefile
@@ -27,7 +27,9 @@ PRG_MAIN := hbtest.prg
 LIBS = $(HB_LIBS_ST_RDD)
 
 ifneq ($(filter $(HB_PLATFORM),win wce os2),)
-   HB_BUILD_SHARED := yes
+   ifneq ($(HB_BUILD_DLL),no)
+      HB_BUILD_SHARED := yes
+   endif
 endif
 
 include $(TOP)$(ROOT)config/bin.mk