From eb76f97482b3d141c9d143b7e30fd57a1fd6e75a Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Mon, 11 May 2009 10:51:39 +0000
Subject: [PATCH] 2009-05-11 13:00 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/rdd/workarea.c     * formatting

  * harbour/source/vm/Makefile
    * minor cleanup

  * harbour/config/dir.cf
    ! added protection against double build call when -j<n> is used in
      install phase
---
 harbour/ChangeLog             | 11 +++++++++++
 harbour/config/dir.cf         |  4 +++-
 harbour/source/rdd/workarea.c |  2 +-
 harbour/source/vm/Makefile    |  4 +++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 20ca2c4bc7..b65a7fdd97 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-11 13:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rdd/workarea.c
+    * formatting
+
+  * harbour/source/vm/Makefile
+    * minor cleanup
+
+  * harbour/config/dir.cf
+    ! added protection against double build call when -j<n> is used in
+      install phase
+
 2009-05-08 14:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * source/rtl/tget.prg
   * source/rtl/tclass.prg
diff --git a/harbour/config/dir.cf b/harbour/config/dir.cf
index 6d9be4137a..2e271715cb 100644
--- a/harbour/config/dir.cf
+++ b/harbour/config/dir.cf
@@ -45,7 +45,9 @@ else
 DIRS_CLEAN = $(foreach dir, $(DIRS_MK), $(dir).clean)
 DIRS_INST  = $(foreach dir, $(DIRS_MK), $(dir).inst)
 
+ifneq ($(_HB_BLD),yes)
 first   :: $(DIRS_MK)
+endif
 install :: $(DIRS_INST)
 clean   :: $(DIRS_CLEAN)
 
@@ -62,7 +64,7 @@ $(DIRS_CLEAN) ::
 	+$(MK) -C $(@:.clean=) clean
 
 $(DIRS_INST) ::
-	+$(MK) -C $(@:.inst=) install
+	+$(MK) -C $(@:.inst=) install _HB_BLD=yes
 
 $(DIRS_MK) ::
 	+$(MK) -C $(@)
diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c
index 6e0b70db96..8038d8fbc6 100644
--- a/harbour/source/rdd/workarea.c
+++ b/harbour/source/rdd/workarea.c
@@ -2122,7 +2122,7 @@ int hb_rddRegister( const char * szDriver, USHORT uiType )
       return 1;
 
    hb_snprintf( szGetFuncTable, sizeof( szGetFuncTable ), "%s_GETFUNCTABLE",
-             szDriver );
+                szDriver );
    pGetFuncTable = hb_dynsymFindName( szGetFuncTable );
    if( !pGetFuncTable )
       return 2;              /* Not valid RDD */
diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile
index 64c7355fee..03d848ed8a 100644
--- a/harbour/source/vm/Makefile
+++ b/harbour/source/vm/Makefile
@@ -33,6 +33,8 @@ endif
 export HB_HVM_ALL
 endif
 
+DIRS=
+
 ifeq ($(HB_ARCHITECTURE),win)
 	ifeq ($(HB_COMPILER),mingw)
 		C_MAIN = mainwin.c
@@ -108,7 +110,7 @@ LIBNAME=hbvm
 HB_USER_CFLAGS:=$(subst -DHB_MT_VM,,$(HB_USER_CFLAGS))
 ifneq ($(HB_ARCHITECTURE),dos)
 ifneq ($(HB_MT),no)
-   DIRS+= vmmt
+	DIRS+= vmmt
 endif
 endif