diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f88535d2da..fadeb7352d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,68 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-14 22:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/pp/Makefile
+    ! Fixed to not throw harmless but still confusing error
+      messages when cleaning hbpp binary parts.
+
+  * bin/hb-mkdyn.bat
+    % Minor optimization in initialization.
+
+  - make_gnu_os2.cmd
+  - make_gnu.bat
+    - Deleted these starter batch files.
+    ; Please use 'mingw32-make' (if installed in PATH) or
+      'config/mingw32-make' (if not installed in PATH) instead.
+      OS/2 users should use 'make'.
+    ; OS/2 users will have to add:
+      set HB_USER_CFLAGS=-DTCPV40HDRS
+      to local configuration unless they used:
+      set HB_OS2_TCP32=yes
+      I'd like to ask OS/2 users to add (now deleted) related
+      documentation to one of our docs: INSTALL or include/hbsetup.h.
+      Since this was a setting to disable some default setup,
+      we can readd this setting with another name to
+      config/global.cf if needed. Pls tell me about it.
+    ; TODO: Delete make_gnu.sh and/or integrate make_gnu_xmingw*.sh.
+            There is still two things which is done by make_gnu.sh:
+              - Detection for -fPIC option.
+              - Setting HB_INSTALL_PREFIX to system location.
+                  (I don't like this, but it seems to be standard
+                  behaviour on Linux, so we may want to change GNU Make
+                  default logic according to that)
+    ; TODO: Move mpkg_*.sh files with related support files to /package.
+            Best would be to integrate them to postinst.sh.
+
+  * INSTALL
+    + Added TOFIX to one example: djgpp with NT shell will choke on
+      too long cmdline when building external/libhpdf.
+    ; TOFIX: see above. (if possible. If it's too complicated we
+             should simply drop this scenario, after all DJGPP GNU
+             Make also works well.
+
+  * contrib/gtalleg/Makefile
+  * contrib/hbmysql/Makefile
+  * contrib/hbodbc/Makefile
+  * contrib/hbsqlit3/Makefile
+  * contrib/hbqt/Makefile
+  * contrib/hbfbird/Makefile
+  * contrib/hbxbp/Makefile
+  * contrib/hbcurl/Makefile
+  * contrib/gtqtc/Makefile
+  * contrib/rddsql/sddmy/Makefile
+  * contrib/rddsql/sddpg/Makefile
+  * contrib/rddsql/sddfb/Makefile
+  * contrib/rddsql/sddodbc/Makefile
+  * contrib/hbhpdf/Makefile
+  * contrib/gtwvg/Makefile
+  * contrib/hbpgsql/Makefile
+  * contrib/rddads/Makefile
+  * contrib/hbfimage/Makefile
+  * contrib/hbgd/Makefile
+  * contrib/hbwin/Makefile
+    + Indentation.
+
 2009-08-14 20:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     % Deleted HB_BIN_COMPILE config lines. Replaced by requirement
diff --git a/harbour/INSTALL b/harbour/INSTALL
index a74020085e..f8c18d7336 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -539,6 +539,7 @@ EXAMPLES
       rem
       mingw32-make %1 %2 > log.txt 2>&1
       ---
+      [ TOFIX: currently chokes on some cmdline limit. ]
 
       --- Open Watcom C++
       SET WATCOM=C:\watcom
diff --git a/harbour/bin/hb-mkdyn.bat b/harbour/bin/hb-mkdyn.bat
index 15e0a46aeb..c044b34b3d 100644
--- a/harbour/bin/hb-mkdyn.bat
+++ b/harbour/bin/hb-mkdyn.bat
@@ -32,44 +32,23 @@ set HB_OBJ_EXT=_dyn.obj
 set HB_OBJ_PREF=
 set HB_OBJ_POST=
 
+set _DST_NAME_POST=
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_bcc"      set _DST_NAME_POST=-bcc
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc64"   set _DST_NAME_POST=-x64
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw64"  set _DST_NAME_POST=-x64
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64"   set _DST_NAME_POST=-x64
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_iccia64"  set _DST_NAME_POST=-ia64
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcia64" set _DST_NAME_POST=-ia64
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm"  set _DST_NAME_POST=-wce-arm
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" set _DST_NAME_POST=-wce-arm
+if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm"  set _DST_NAME_POST=-wce-arm
+
+set _DST_NAME_ST=harbour-%HB_DLL_VERSION%%_DST_NAME_POST%
+set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%%_DST_NAME_POST%
+
 set _LIST_ST=%HB_BIN_INSTALL%\_hballst.txt
 set _LIST_MT=%HB_BIN_INSTALL%\_hballmt.txt
 
-set _DST_NAME_ST=
-set _DST_NAME_MT=
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_icc"      set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_icc"      set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_iccia64"  set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-ia64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_iccia64"  set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-ia64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc"     set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc"     set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm"  set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-wce-arm
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_msvcarm"  set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-wce-arm
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc64"   set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvc64"   set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-x64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcia64" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-ia64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_msvcia64" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-ia64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw"    set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw"    set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw64"  set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_mingw64"  set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-x64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-wce-arm
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_mingwarm" set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-wce-arm
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_cygwin"   set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_cygwin"   set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_bcc"      set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-bcc
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_bcc"      set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-bcc
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_watcom"   set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_watcom"   set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc"     set _DST_NAME_ST=harbour-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc"     set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64"   set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-x64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "win_pocc64"   set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-x64
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm"  set _DST_NAME_ST=harbour-%HB_DLL_VERSION%-wce-arm
-if "%HB_ARCHITECTURE%_%HB_COMPILER%" == "wce_poccarm"  set _DST_NAME_MT=harbourmt-%HB_DLL_VERSION%-wce-arm
-
-if "%_DST_NAME_ST%" == "" ( echo ! Harbour .dll creation isn't supported for this platform. && goto END )
-
 if "%HB_ARCHITECTURE%" == "wce"      set HB_DLL_LIBS_WIN=
 if not "%HB_COMPILER%" == "watcom"   set HB_DLL_LIBS_WATCOM=
 if "%HB_COMPILER%"     == "mingw"    set HB_OBJ_EXT=.o
@@ -245,8 +224,8 @@ for %%f in (%HB_DLL_LIBS_ST%) do (
       rem echo ! Processing directory: %%f\%HB_OBJ_DIR%
       dir /b "%%f\%HB_OBJ_DIR%\*%HB_OBJ_EXT%" > "%HB_BIN_INSTALL%\_hboraw.txt"
       for /F %%p in (%HB_BIN_INSTALL%\_hboraw.txt) do (
-         if not "%HB_COMPILER%-%%p" == "watcom-mainstd%HB_OBJ_EXT%" (
-         if not "%HB_COMPILER%-%%p" == "watcom-mainwin%HB_OBJ_EXT%" (
+         if not "%HB_COMPILER%_%%p" == "watcom_mainstd%HB_OBJ_EXT%" (
+         if not "%HB_COMPILER%_%%p" == "watcom_mainwin%HB_OBJ_EXT%" (
             echo %HB_OBJ_PREF%%%f\%HB_OBJ_DIR%\%%p%HB_OBJ_POST%>> "%_LIST_ST%"
          )
          )
@@ -261,8 +240,8 @@ for %%f in (%HB_DLL_LIBS_MT%) do (
       rem echo ! Processing directory: %%f\%HB_OBJ_DIR%
       dir /b "%%f\%HB_OBJ_DIR%\*%HB_OBJ_EXT%" > "%HB_BIN_INSTALL%\_hboraw.txt"
       for /F %%p in (%HB_BIN_INSTALL%\_hboraw.txt) do (
-         if not "%HB_COMPILER%-%%p" == "watcom-mainstd%HB_OBJ_EXT%" (
-         if not "%HB_COMPILER%-%%p" == "watcom-mainwin%HB_OBJ_EXT%" (
+         if not "%HB_COMPILER%_%%p" == "watcom_mainstd%HB_OBJ_EXT%" (
+         if not "%HB_COMPILER%_%%p" == "watcom_mainwin%HB_OBJ_EXT%" (
             echo %HB_OBJ_PREF%%%f\%HB_OBJ_DIR%\%%p%HB_OBJ_POST%>> "%_LIST_MT%"
          )
          )
diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile
index 12d00cdfcb..266ebb57fd 100644
--- a/harbour/contrib/gtalleg/Makefile
+++ b/harbour/contrib/gtalleg/Makefile
@@ -17,9 +17,9 @@ ifneq ($(HB_COMPILER),watcom)
 ifneq ($(HB_COMPILER),mingwarm)
 
 ifeq ($(HB_INC_ALLEGRO),)
-ifeq ($(HB_XBUILD),)
-HB_INC_ALLEGRO := /usr/include /opt/local/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_ALLEGRO := /usr/include /opt/local/include
+   endif
 endif
 
 HB_INC_ALLEGRO_OK := $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegro.h),$(d),))
@@ -27,8 +27,8 @@ HB_INC_ALLEGRO_OK := $(foreach d, $(HB_INC_ALLEGRO), $(if $(wildcard $(d)/allegr
 ifneq ($(strip $(HB_INC_ALLEGRO_OK)),)
 
 ifneq ($(HB_ALLEGRO_STATIC),)
-LIBNAME := gtallegs
-HB_USER_CFLAGS += -DALLEGRO_STATICLINK
+   LIBNAME := gtallegs
+   HB_USER_CFLAGS += -DALLEGRO_STATICLINK
 endif
 
 HB_USER_CFLAGS += $(foreach d, $(HB_INC_ALLEGRO_OK), -I$(d))
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index 072f7fb0c4..97074eb44e 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -9,63 +9,63 @@ include $(TOP)$(ROOT)config/global.cf
 LIBNAME := gtqtc
 
 ifeq ($(HB_WITH_QT),)
-HB_WITH_QT := yes
-ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_ARCHITECTURE),os2)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),mingw64)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),watcom)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),bcc)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),pocc)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),pocc64)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),poccarm)
-HB_WITH_QT := no
-endif
+   HB_WITH_QT := yes
+   ifeq ($(HB_ARCHITECTURE),dos)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_ARCHITECTURE),os2)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),mingw64)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),watcom)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),bcc)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),pocc)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),pocc64)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),poccarm)
+      HB_WITH_QT := no
+   endif
 endif
 
 ifeq ($(HB_WITH_QT),yes)
 
 ifeq ($(HB_INC_QT),)
-ifeq ($(HB_XBUILD),)
-HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+   endif
 endif
 
 HB_INC_QT_OK := $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),))
 ifeq ($(HB_ARCHITECTURE),darwin)
-ifeq ($(strip $(HB_INC_QT_OK)),)
-HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
-ifeq ($(HB_INC_QT_OK),spec)
-HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
-HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
-HB_USER_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
-HB_USER_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
-endif
-endif
+   ifeq ($(strip $(HB_INC_QT_OK)),)
+      HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
+      ifeq ($(HB_INC_QT_OK),spec)
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+      endif
+   endif
 endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),)
 
 ifneq ($(HB_QT_STATIC),)
-LIBNAME=gtqtcs
-HB_USER_CFLAGS += -DQT_NODLL
+   LIBNAME=gtqtcs
+   HB_USER_CFLAGS += -DQT_NODLL
 endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),spec)
-HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
 endif
 
 CPP_SOURCES := \
diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile
index 70907538b2..c469497e7f 100644
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -11,28 +11,26 @@ HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
 LIBNAME := gtwvg
 
 ifeq ($(HB_WITH_GTWVG),)
-ifeq ($(HB_ARCHITECTURE),win)
-
-ifeq ($(HB_COMPILER),mingw)
-HB_WITH_GTWVG := yes
-endif
-ifeq ($(HB_COMPILER),msvc)
-HB_WITH_GTWVG := yes
-endif
-ifeq ($(HB_COMPILER),watcom)
-HB_WITH_GTWVG := yes
-endif
-ifeq ($(HB_COMPILER),pocc)
-HB_WITH_GTWVG := yes
-endif
-ifeq ($(HB_COMPILER),icc)
-HB_WITH_GTWVG := yes
-endif
-ifeq ($(HB_COMPILER),bcc)
-HB_WITH_GTWVG := yes
-endif
-
-endif
+   ifeq ($(HB_ARCHITECTURE),win)
+      ifeq ($(HB_COMPILER),mingw)
+         HB_WITH_GTWVG := yes
+      endif
+      ifeq ($(HB_COMPILER),msvc)
+         HB_WITH_GTWVG := yes
+      endif
+      ifeq ($(HB_COMPILER),watcom)
+         HB_WITH_GTWVG := yes
+      endif
+      ifeq ($(HB_COMPILER),pocc)
+         HB_WITH_GTWVG := yes
+      endif
+      ifeq ($(HB_COMPILER),icc)
+         HB_WITH_GTWVG := yes
+      endif
+      ifeq ($(HB_COMPILER),bcc)
+         HB_WITH_GTWVG := yes
+      endif
+   endif
 endif
 
 ifeq ($(HB_WITH_GTWVG),yes)
diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile
index 13415a1265..7bbf5bc06b 100644
--- a/harbour/contrib/hbcurl/Makefile
+++ b/harbour/contrib/hbcurl/Makefile
@@ -13,9 +13,9 @@ HB_INC_CURL_OK :=
 ifneq ($(HB_ARCHITECTURE),dos)
 
 ifeq ($(HB_INC_CURL),)
-ifeq ($(HB_XBUILD),)
-HB_INC_CURL := /usr/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_CURL := /usr/include
+   endif
 endif
 
 HB_INC_CURL_OK := $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),))
@@ -41,10 +41,10 @@ install::
 	$(INSTALL_RULE_HEADERS)
 
 ifeq ($(HB_ARCHITECTURE),win)
-DIRS += hbcurls
+   DIRS += hbcurls
 endif
 ifeq ($(HB_ARCHITECTURE),wce)
-DIRS += hbcurls
+   DIRS += hbcurls
 endif
 
 ifneq ($(DIRS),)
diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile
index 9ac91bd8a1..dcdaa61ff9 100644
--- a/harbour/contrib/hbfbird/Makefile
+++ b/harbour/contrib/hbfbird/Makefile
@@ -12,9 +12,9 @@ ifneq ($(HB_COMPILER),pocc64)
 ifneq ($(HB_COMPILER),poccarm)
 
 ifeq ($(HB_INC_FIREBIRD),)
-ifeq ($(HB_XBUILD),)
-HB_INC_FIREBIRD := /usr/include /opt/firebird/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_FIREBIRD := /usr/include /opt/firebird/include
+   endif
 endif
 
 HB_INC_FIREBIRD_OK := $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibase.h),$(d),))
diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile
index 66bbdd7fba..d3295ba960 100644
--- a/harbour/contrib/hbfimage/Makefile
+++ b/harbour/contrib/hbfimage/Makefile
@@ -17,9 +17,9 @@ ifneq ($(HB_ARCHITECTURE),linux)
 ifneq ($(HB_ARCHITECTURE),darwin)
 
 ifeq ($(HB_INC_FREEIMAGE),)
-ifeq ($(HB_XBUILD),)
-HB_INC_FREEIMAGE := /usr/include /opt/local/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_FREEIMAGE := /usr/include /opt/local/include
+   endif
 endif
 
 HB_INC_FREEIMAGE_OK := $(foreach d, $(HB_INC_FREEIMAGE), $(if $(wildcard $(d)/FreeImage.h),$(d),))
diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile
index d128a4651d..b0373af4ce 100644
--- a/harbour/contrib/hbgd/Makefile
+++ b/harbour/contrib/hbgd/Makefile
@@ -13,9 +13,9 @@ ROOT := ../../
 LIBNAME := hbgd
 
 ifeq ($(HB_INC_GD),)
-ifeq ($(HB_XBUILD),)
-HB_INC_GD := /usr/include /opt/local/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_GD := /usr/include /opt/local/include
+   endif
 endif
 
 HB_INC_GD_OK := $(foreach d, $(HB_INC_GD), $(if $(wildcard $(d)/gd.h),$(d),))
diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile
index 0c6784717e..2721876dae 100644
--- a/harbour/contrib/hbhpdf/Makefile
+++ b/harbour/contrib/hbhpdf/Makefile
@@ -7,9 +7,9 @@ ROOT = ../../
 LIBNAME := hbhpdf
 
 ifeq ($(HB_INC_LIBHARU),)
-ifeq ($(HB_XBUILD),)
-HB_INC_LIBHARU = /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_LIBHARU = /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
+   endif
 endif
 
 HB_INC_LIBHARU_OK := $(foreach d, $(HB_INC_LIBHARU), $(if $(wildcard $(d)/hpdf.h),$(d),))
diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile
index 9984297db3..02e5059c37 100644
--- a/harbour/contrib/hbmysql/Makefile
+++ b/harbour/contrib/hbmysql/Makefile
@@ -7,9 +7,9 @@ ROOT := ../../
 LIBNAME := hbmysql
 
 ifeq ($(HB_INC_MYSQL),)
-ifeq ($(HB_XBUILD),)
-HB_INC_MYSQL := /usr/include/mysql /opt/local/include/mysql5/mysql
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_MYSQL := /usr/include/mysql /opt/local/include/mysql5/mysql
+   endif
 endif
 
 HB_INC_MYSQL_OK := $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$(d),))
diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile
index ca147213c9..d0dbc86747 100644
--- a/harbour/contrib/hbodbc/Makefile
+++ b/harbour/contrib/hbodbc/Makefile
@@ -9,13 +9,13 @@ include $(TOP)$(ROOT)config/global.cf
 LIBNAME := hbodbc
 
 ifeq ($(HB_COMPILER),rsxnt)
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 ifeq ($(HB_ARCHITECTURE),os2)
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 
 ifneq ($(HB_ARCHITECTURE),win)
@@ -23,17 +23,17 @@ ifneq ($(HB_ARCHITECTURE),wce)
 ifeq ($(HB_WITHOUT_ODBC),)
 
 ifeq ($(HB_INC_ODBC),)
-ifeq ($(HB_XBUILD),)
-HB_INC_ODBC := /usr/include /usr/local/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_ODBC := /usr/include /usr/local/include
+   endif
 endif
 
 HB_INC_ODBC_OK := $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d),))
 
 ifneq ($(strip $(HB_INC_ODBC_OK)),)
-HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
+   HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
 else
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 
 endif
diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile
index 8216d51017..084a08bc60 100644
--- a/harbour/contrib/hbpgsql/Makefile
+++ b/harbour/contrib/hbpgsql/Makefile
@@ -7,9 +7,9 @@ ROOT := ../../
 LIBNAME := hbpgsql
 
 ifeq ($(HB_INC_PGSQL),)
-ifeq ($(HB_XBUILD),)
-HB_INC_PGSQL := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_PGSQL := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83
+   endif
 endif
 
 HB_INC_PGSQL_OK := $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h),$(d),))
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index 7ab7fa13e2..2dd5251c01 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -9,63 +9,63 @@ include $(TOP)$(ROOT)config/global.cf
 LIBNAME := hbqt
 
 ifeq ($(HB_WITH_QT),)
-HB_WITH_QT := yes
-ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_ARCHITECTURE),os2)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),mingw64)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),watcom)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),bcc)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),pocc)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),pocc64)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),poccarm)
-HB_WITH_QT := no
-endif
+   HB_WITH_QT := yes
+   ifeq ($(HB_ARCHITECTURE),dos)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_ARCHITECTURE),os2)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),mingw64)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),watcom)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),bcc)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),pocc)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),pocc64)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),poccarm)
+      HB_WITH_QT := no
+   endif
 endif
 
 ifeq ($(HB_WITH_QT),yes)
 
 ifeq ($(HB_INC_QT),)
-ifeq ($(HB_XBUILD),)
-HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
+   endif
 endif
 
 HB_INC_QT_OK := $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),))
 ifeq ($(HB_ARCHITECTURE),darwin)
-ifeq ($(strip $(HB_INC_QT_OK)),)
-HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
-ifeq ($(HB_INC_QT_OK),spec)
-HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
-HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
-HB_USER_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
-HB_USER_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
-endif
-endif
+   ifeq ($(strip $(HB_INC_QT_OK)),)
+      HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
+      ifeq ($(HB_INC_QT_OK),spec)
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+         HB_USER_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+      endif
+   endif
 endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),)
 
 ifneq ($(HB_QT_STATIC),)
-LIBNAME := hbqts
-HB_USER_CFLAGS += -DQT_NODLL
+   LIBNAME := hbqts
+   HB_USER_CFLAGS += -DQT_NODLL
 endif
 
 ifneq ($(strip $(HB_INC_QT_OK)),spec)
-HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
+   HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
 endif
 
 include $(TOP)$(ROOT)contrib/hbqt/Makefile_gen
diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile
index 569fdfe242..9b812b5bc5 100644
--- a/harbour/contrib/hbsqlit3/Makefile
+++ b/harbour/contrib/hbsqlit3/Makefile
@@ -9,21 +9,21 @@ include $(TOP)$(ROOT)config/global.cf
 LIBNAME := hbsqlit3
 
 ifeq ($(HB_INC_SQLITE3),)
-ifeq ($(HB_XBUILD),)
-HB_INC_SQLITE3 := /usr/include
-ifeq ($(HB_ARCHITECTURE),win)
-HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
-endif
-ifeq ($(HB_ARCHITECTURE),wce)
-HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
-endif
-ifeq ($(HB_ARCHITECTURE),os2)
-HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
-endif
-ifeq ($(HB_ARCHITECTURE),dos)
-HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
-endif
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_SQLITE3 := /usr/include
+      ifeq ($(HB_ARCHITECTURE),win)
+         HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
+      endif
+      ifeq ($(HB_ARCHITECTURE),wce)
+         HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
+      endif
+      ifeq ($(HB_ARCHITECTURE),os2)
+         HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
+      endif
+      ifeq ($(HB_ARCHITECTURE),dos)
+         HB_INC_SQLITE3 += $(TOP)$(ROOT)external/sqlite3
+      endif
+   endif
 endif
 
 HB_INC_SQLITE3_OK := $(foreach d, $(HB_INC_SQLITE3), $(if $(wildcard $(d)/sqlite3.h),$(d),))
diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile
index 8610192088..9c8afb1d77 100644
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -9,12 +9,12 @@ include $(TOP)$(ROOT)config/global.cf
 LIBNAME := hbwin
 
 ifeq ($(HB_WITH_HBWIN),)
-ifeq ($(HB_ARCHITECTURE),win)
-HB_WITH_HBWIN := yes
-endif
-ifeq ($(HB_ARCHITECTURE),wce)
-HB_WITH_HBWIN := yes
-endif
+   ifeq ($(HB_ARCHITECTURE),win)
+      HB_WITH_HBWIN := yes
+   endif
+   ifeq ($(HB_ARCHITECTURE),wce)
+      HB_WITH_HBWIN := yes
+   endif
 endif
 
 ifeq ($(HB_WITH_HBWIN),yes)
diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile
index 961d5fd5f4..3843a3c66d 100644
--- a/harbour/contrib/hbxbp/Makefile
+++ b/harbour/contrib/hbxbp/Makefile
@@ -11,31 +11,31 @@ HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt
 LIBNAME := hbxbp
 
 ifeq ($(HB_WITH_QT),)
-HB_WITH_QT := yes
-ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_ARCHITECTURE),os2)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),mingw64)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),watcom)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),bcc)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),pocc)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),pocc64)
-HB_WITH_QT := no
-endif
-ifeq ($(HB_COMPILER),poccarm)
-HB_WITH_QT := no
-endif
+   HB_WITH_QT := yes
+   ifeq ($(HB_ARCHITECTURE),dos)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_ARCHITECTURE),os2)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),mingw64)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),watcom)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),bcc)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),pocc)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),pocc64)
+      HB_WITH_QT := no
+   endif
+   ifeq ($(HB_COMPILER),poccarm)
+      HB_WITH_QT := no
+   endif
 endif
 
 ifeq ($(HB_WITH_QT),yes)
diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile
index ce611c52a1..24c3790a03 100644
--- a/harbour/contrib/rddads/Makefile
+++ b/harbour/contrib/rddads/Makefile
@@ -12,7 +12,7 @@ ifneq ($(HB_ARCHITECTURE),dos)
 ifneq ($(HB_ARCHITECTURE),os2)
 
 ifeq ($(HB_INC_ADS),)
-HB_INC_ADS := /usr/local/ads/acesdk $(HOME)/ads/acesdk
+   HB_INC_ADS := /usr/local/ads/acesdk $(HOME)/ads/acesdk
 endif
 
 HB_INC_ADS_OK := $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),))
diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/rddsql/sddfb/Makefile
index 0270f39f4c..b70024e1e9 100644
--- a/harbour/contrib/rddsql/sddfb/Makefile
+++ b/harbour/contrib/rddsql/sddfb/Makefile
@@ -11,9 +11,9 @@ LIBNAME := sddfb
 ifneq ($(HB_COMPILER),pocc64)
 
 ifeq ($(HB_INC_FIREBIRD),)
-ifeq ($(HB_XBUILD),)
-HB_INC_FIREBIRD := /usr/include /opt/firebird/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_FIREBIRD := /usr/include /opt/firebird/include
+   endif
 endif
 
 HB_INC_FIREBIRD_OK := $(foreach d, $(HB_INC_FIREBIRD), $(if $(wildcard $(d)/ibase.h),$(d),))
diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/rddsql/sddmy/Makefile
index 71f2228866..72c768468a 100644
--- a/harbour/contrib/rddsql/sddmy/Makefile
+++ b/harbour/contrib/rddsql/sddmy/Makefile
@@ -7,9 +7,9 @@ ROOT := ../../../
 LIBNAME := sddmy
 
 ifeq ($(HB_INC_MYSQL),)
-ifeq ($(HB_XBUILD),)
-HB_INC_MYSQL := /usr/include/mysql /opt/local/include/mysql5/mysql
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_MYSQL := /usr/include/mysql /opt/local/include/mysql5/mysql
+   endif
 endif
 
 HB_INC_MYSQL_OK := $(foreach d, $(HB_INC_MYSQL), $(if $(wildcard $(d)/mysql.h),$(d),))
diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile
index 85c7fb268d..2e5c8984aa 100644
--- a/harbour/contrib/rddsql/sddodbc/Makefile
+++ b/harbour/contrib/rddsql/sddodbc/Makefile
@@ -9,13 +9,13 @@ include $(TOP)$(ROOT)config/global.cf
 LIBNAME := sddodbc
 
 ifeq ($(HB_COMPILER),rsxnt)
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 ifeq ($(HB_ARCHITECTURE),os2)
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 
 ifneq ($(HB_ARCHITECTURE),win)
@@ -23,17 +23,17 @@ ifneq ($(HB_ARCHITECTURE),wce)
 ifeq ($(HB_WITHOUT_ODBC),)
 
 ifeq ($(HB_INC_ODBC),)
-ifeq ($(HB_XBUILD),)
-HB_INC_ODBC := /usr/include /usr/local/include
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_ODBC := /usr/include /usr/local/include
+   endif
 endif
 
 HB_INC_ODBC_OK := $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d),))
 
 ifneq ($(strip $(HB_INC_ODBC_OK)),)
-HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
+   HB_USER_CFLAGS += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
 else
-HB_WITHOUT_ODBC := yes
+   HB_WITHOUT_ODBC := yes
 endif
 
 endif
diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/rddsql/sddpg/Makefile
index 084524dec6..325522c05e 100644
--- a/harbour/contrib/rddsql/sddpg/Makefile
+++ b/harbour/contrib/rddsql/sddpg/Makefile
@@ -7,9 +7,9 @@ ROOT := ../../../
 LIBNAME := sddpg
 
 ifeq ($(HB_INC_PGSQL),)
-ifeq ($(HB_XBUILD),)
-HB_INC_PGSQL := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83
-endif
+   ifeq ($(HB_XBUILD),)
+      HB_INC_PGSQL := /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83
+   endif
 endif
 
 HB_INC_PGSQL_OK := $(foreach d, $(HB_INC_PGSQL), $(if $(wildcard $(d)/libpq-fe.h),$(d),))
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
deleted file mode 100644
index e28a41f418..0000000000
--- a/harbour/make_gnu.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@rem
-@rem $Id$
-@rem
-
-@echo off
-
-rem ---------------------------------------------------------------
-rem Copyright 1999-2009 Viktor Szakats (harbour.01 syenar.hu)
-rem See COPYING for licensing terms.
-rem
-rem Please read INSTALL for further information.
-rem ---------------------------------------------------------------
-
-rem Decide about GNU Make executable name
-
-rem Some other name variations: gnumake.exe, gmake.exe
-set _HB_MAKE=
-if "%_HB_MAKE%%OS%" == "Windows_NT" if exist "%~dp0config\mingw32-make.exe" set _HB_MAKE="%~dp0config\mingw32-make.exe"
-if "%_HB_MAKE%%OS%" == "Windows_NT" set _HB_MAKE=mingw32-make.exe
-if "%OS%" == "Windows_NT" goto _FM_DONE
-if     exist config\dj-make.exe set _HB_MAKE=config\dj-make.exe
-if not exist config\dj-make.exe set _HB_MAKE=make.exe
-:_FM_DONE
-
-rem Start the GNU Make system
-
-%_HB_MAKE% %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
-if errorlevel 1 echo Harbour GNU Make returned: %ERRORLEVEL%
-
-set _HB_MAKE=
diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd
deleted file mode 100644
index 0e4426dd01..0000000000
--- a/harbour/make_gnu_os2.cmd
+++ /dev/null
@@ -1,37 +0,0 @@
-@rem
-@rem $Id$
-@rem
-
-@echo off
-
-rem ---------------------------------------------------------------
-rem Harbour Project build script (for OS/2)
-rem
-rem Please read INSTALL for further information.
-rem ---------------------------------------------------------------
-
-rem Minimal initialization of environment variables for OS2 GCC build
-rem for further information about see make_gnu.bat
-
-rem In GCC3.2.2 the TCP/IP headers and libraries scheme have been changed.
-rem The default is the current OS/2 tcpip toolkit (BSD 4.4 based).
-rem To target the older OS/2 tcpip stack (BSD 4.3 based) and create
-rem binaries which can be executed also on older OS2 versions you must
-rem define TCPV40HDRS before including any TCP/IP headers and make
-rem sure usr/lib/tcpipv4 is searched before usr/lib (this is to
-rem get the right libsocket). It is recommended to use the -D
-rem compiler option for the define and either the LIBRARY_PATH or
-rem the -L compiler/linker option for the library.
-rem For building Harbour you can also use HB_USER_LDFLAGS environment variable,
-rem f.e.
-rem         set HB_USER_LDFLAGS=-Le:\usr\lib\tcpipv4
-rem
-rem If you are using newer OS2 version with tcp/ip stack >= 4.1
-rem (eComStation, for example) and you do not need backward binary
-rem compatibility then you can disable it by setting HB_OS2_TCP32
-rem environment variable, f.e.
-rem         set HB_OS2_TCP32=yes
-
-if not "%HB_OS2_TCP32%" == "yes" set HB_USER_CFLAGS=-DTCPV40HDRS %HB_USER_CFLAGS%
-
-make %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 81ff355d6b..c232517ea8 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -47,9 +47,9 @@ install::
 	$(INSTALL_RULE_LIBRARIES)
 
 clean::
-	-@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER))
-	-@$(RM) $(subst /,$(DIRSEP),$(BIN_DIR)/hbpp$(BIN_EXT))
-	-@$(RM) $(subst /,$(DIRSEP),$(BIN_DIR)/hbpp.tds)
+	$(if $(wildcard $(HB_VERHEADER)),          -@$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER)),)
+	$(if $(wildcard $(BIN_DIR)/hbpp$(BIN_EXT)),-@$(RM) $(subst /,$(DIRSEP),$(BIN_DIR)/hbpp$(BIN_EXT)),)
+	$(if $(wildcard $(BIN_DIR)/hbpp.tds),      -@$(RM) $(subst /,$(DIRSEP),$(BIN_DIR)/hbpp.tds),)
 
 endif
 endif