diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c66eaada47..212451af52 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-28 09:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/pp/Makefile
+    ! Do not install hbpp executable when HB_HOST_BUILD == 'lib'.
+      Please verify me.
+
+  * config/global.cf
+    % Minor simplification to HB_*_INSTALL defaulting.
+
+  * utils/hbmk2/hbmk2.prg
+    * Minor formatting.
+
 2009-07-27 23:42 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/xbp.ch
   * contrib/hbxbp/xbpbrowse.prg
@@ -28,24 +39,24 @@
   + contrib/hbxbp/tests/test.dbf
     + Demonstrated XbpBrowse() implementation.
 
-      NOTE: Current implementation is just a proof of concept that 
-            TBrowse or XbpBrowse like behavior can be simulated. But a lot 
-            more work is needed to reach the destination. Currently, 
+      NOTE: Current implementation is just a proof of concept that
+            TBrowse or XbpBrowse like behavior can be simulated. But a lot
+            more work is needed to reach the destination. Currently,
             data is fetched based on recno(). Qt's Model/View framework
             expects number of rows to be supplied at the begining and hence
             I could find only recno() to pull the row information.
-            I have an idea how exact behavior can be simulated but that 
-            will need a lot of base work. So for now just play with what 
+            I have an idea how exact behavior can be simulated but that
+            will need a lot of base work. So for now just play with what
             I could achieve. Also note that on the face value, pure Xbase++ code
-            is working - headers, cell colors, colorblock, navigation, etc. Just study 
+            is working - headers, cell colors, colorblock, navigation, etc. Just study
             the code and you will know how difficult it was just to precieve how
             this could been achieved.
                  Any suggestions in direction are welcome.
 
 2009-07-27 23:36 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/generator/hbqtgen.prg
-    + Added one more section <SUBCLASS> </SUBCLASS>. This holds .PRG 
-      code representing a subclass inherited from main class. .CPP code is 
+    + Added one more section <SUBCLASS> </SUBCLASS>. This holds .PRG
+      code representing a subclass inherited from main class. .CPP code is
       held in hbqt_slots.cpp.
 
   * contrib/hbqt/qth/QAbstractItemModel.qth
@@ -60,7 +71,7 @@
   * contrib/hbqt/QTableView.cpp
   * contrib/hbqt/TQAbstractItemModel.prg
   * contrib/hbqt/TQTableView.prg
-    ! result of <SUBCLASS> </SUBCLASS> implementation.    
+    ! result of <SUBCLASS> </SUBCLASS> implementation.
 
 2009-07-28 01:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/libhpdf/Makefile
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index 41450df646..aecec5afb4 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -369,20 +369,20 @@ ifneq ($(HB_DB_DRVEXT),)
 endif
 
 ifeq ($(HB_UNIX_COMPATIBLE),no)
-   LIBPOSTFIX := $(DIRSEP)$(HB_ARHICTECTURE)$(DIRSEP)$(HB_COMPILER)
+   LIBPOSTFIX := /$(ARCH_COMP)
 endif
 
 ifeq ($(HB_BIN_INSTALL),)
-   export HB_BIN_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)bin
+   export HB_BIN_INSTALL := $(HB_INSTALL_PREFIX)/bin
 endif
 ifeq ($(HB_LIB_INSTALL),)
-   export HB_LIB_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)lib$(LIBPOSTFIX)
+   export HB_LIB_INSTALL := $(HB_INSTALL_PREFIX)/lib$(LIBPOSTFIX)
 endif
 ifeq ($(HB_INC_INSTALL),)
-   export HB_INC_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)include$(INCPOSTFIX)
+   export HB_INC_INSTALL := $(HB_INSTALL_PREFIX)/include$(INCPOSTFIX)
 endif
 ifeq ($(HB_DOC_INSTALL),)
-   export HB_DOC_INSTALL := $(HB_INSTALL_PREFIX)$(DIRSEP)doc
+   export HB_DOC_INSTALL := $(HB_INSTALL_PREFIX)/doc
 endif
 
 ifeq ($(HB_BIN_COMPILE),)
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 1bb0d62e04..4d3639ce9f 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -33,12 +33,14 @@ pptable.c : hbpp$(EXE_EXT)
 	$(HB_HOST_BIN_DIR)/hbpp$(HB_HOST_BIN_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q -c$(TOP)$(ROOT) -v$(HB_VERHEADER)
 
 
+ifneq ($(HB_HOST_BUILD),lib)
 ifneq ($(HB_BIN_INSTALL),)
 INSTALL_FILES = $(EXE_DIR)/hbpp$(EXE_EXT)
 INSTALL_DIR = $(HB_BIN_INSTALL)
 HB_INSTALL_DEF = yes
 include $(TOP)$(ROOT)config/install.cf
 endif
+endif
 
 install::
 	$(INSTALL_RULE_LIBRARIES)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2df5bda385..eb981aa582 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5153,7 +5153,7 @@ STATIC PROCEDURE HBC_ProcessAll( hbmk, lConfigOnly )
 
 #define _EOL                    Chr( 10 )
 
-STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel  )
+STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
    LOCAL cFile
    LOCAL cLine
    LOCAL cItem