diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4db0792c0f..1bab3a35b3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,25 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-11 17:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/rules.cf
+  * config/dos/dir.cf
+  * config/dos/global.cf
+  * config/dos/install.cf
+  * config/none.cf
+  * config/win/global.cf
+  * config/win/install.cf
+  * config/win/dir.cf
+  * config/win/mingw.cf
+  * config/os2/dir.cf
+  * config/os2/global.cf
+  * config/os2/install.cf
+  * config/wce/dir.cf
+  * config/wce/global.cf
+  * config/wce/mingwarm.cf
+  * config/wce/install.cf
+    * Syncing/cleanup effort.
+
 2009-07-11 17:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/dos/watcom.cf
   * harbour/config/win/watcom.cf
diff --git a/harbour/config/dos/dir.cf b/harbour/config/dos/dir.cf
index 3aa591fef9..5e88e491fc 100644
--- a/harbour/config/dos/dir.cf
+++ b/harbour/config/dos/dir.cf
@@ -10,7 +10,7 @@ DIR_RULE = @echo Done
 
 else
 
-ifeq ($(SHLVL),) # COMMAND.COM
+ifeq ($(SHLVL),) # non-bash
 
 # We have to use script to overcome the DOS limit of max 128 characters
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
@@ -33,7 +33,7 @@ DIR_RULE =\
 	  fi \
 	done
 
-endif # ! COMMAND.COM
+endif # ! non-bash
 
 endif # ! Empty directory list
 
diff --git a/harbour/config/dos/global.cf b/harbour/config/dos/global.cf
index 68621f4d31..4023e0d7ec 100644
--- a/harbour/config/dos/global.cf
+++ b/harbour/config/dos/global.cf
@@ -19,7 +19,7 @@ HB_GT_LIST=\
 #HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),))
 HB_GT_LIBS := $(HB_GT_LIST)
 
-ifeq ($(SHLVL),) # COMMAND.COM
+ifeq ($(SHLVL),) # non-bash
 
 # There is a conflict with the use of '\' and '/' characters
 # The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
diff --git a/harbour/config/dos/install.cf b/harbour/config/dos/install.cf
index 13a45492de..5b453c104d 100644
--- a/harbour/config/dos/install.cf
+++ b/harbour/config/dos/install.cf
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
 
 else
 
-ifeq ($(SHLVL),) # COMMAND.COM
+ifeq ($(SHLVL),) # non-bash
 
 # We have to use script to overcome the DOS limit of max 128 characters
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/none.cf b/harbour/config/none.cf
index 018dfab8a5..6cb780296a 100644
--- a/harbour/config/none.cf
+++ b/harbour/config/none.cf
@@ -10,7 +10,7 @@ ifneq ($(ComSpec),)
 endif
 
 CMDPREF:=
-ifeq ($(SHLVL),)
+ifeq ($(SHLVL),) # non-bash
    ifneq ($(COMSPEC),)
       CMDPREF := $(COMSPEC) /C
    endif
diff --git a/harbour/config/os2/dir.cf b/harbour/config/os2/dir.cf
index c1929231ef..fed1cd24b9 100644
--- a/harbour/config/os2/dir.cf
+++ b/harbour/config/os2/dir.cf
@@ -10,7 +10,7 @@ DIR_RULE = @echo Done
 
 else
 
-ifeq ($(SHLVL),) # An OS/2 command shell
+ifeq ($(SHLVL),) # non-bash
 
 DIR_MAKE = $(subst /,\,$(MK))
 DIR_LIST = $(subst /,\,$(DIRS))
@@ -20,12 +20,12 @@ else  # bash
 
 DIR_RULE =\
 	@for d in $(DIRS); do \
-		if [ -d $$d ]; then \
-			$(MAKE) -C $$d $@; \
-		fi \
+	  if [ -d $$d ]; then \
+	    $(MAKE) -C $$d $@; \
+	  fi \
 	done
 
-endif # ! OS/2 command shell
+endif # ! non-bash
 
 endif # ! Empty directory list
 
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index fe65037d7f..c32e33e42d 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -15,7 +15,7 @@ HB_GT_LIST=\
 # temporary workaround for some possible problems with some GNU make versions
 HB_GT_LIBS := $(HB_GT_LIST)
 
-ifeq ($(SHLVL),) # An OS/2 command shell
+ifeq ($(SHLVL),) # non-bash
 
 ARCH_DIR = $(HB_ARCH)
 OS2_ARCH_DIR = $(subst /,\,$(HB_ARCH))
diff --git a/harbour/config/os2/install.cf b/harbour/config/os2/install.cf
index a475ae6b87..3a78d60b13 100644
--- a/harbour/config/os2/install.cf
+++ b/harbour/config/os2/install.cf
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
 
 else
 
-ifeq ($(SHLVL),) # An OS/2 command shell
+ifeq ($(SHLVL),) # non-bash
 
 # We have to use script to overcome the max command size limit
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf
index 7a93671d64..e756e0e636 100644
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -89,7 +89,7 @@ endif
 %.c : $(GRANDP)%.prg
 	$(HB_RULE)
 
-ifeq ($(SHLVL),) # COMMAND.COM
+ifeq ($(SHLVL),) # non-bash
 # Do nothing. the $(HB_ARCHITECTURE)/global.cf will handle clean up.
 else
 # Generic rule to clean up.
diff --git a/harbour/config/wce/dir.cf b/harbour/config/wce/dir.cf
index 59e8f79252..e56a598784 100644
--- a/harbour/config/wce/dir.cf
+++ b/harbour/config/wce/dir.cf
@@ -4,7 +4,7 @@
 
 ifeq ($(PM),) # Only traverse directories if not compiling a specific module
 
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 
 ifeq ($(DIRS),) # Empty directory list
 DIR_RULE =\
@@ -25,6 +25,6 @@ DIR_RULE =\
 	  fi \
 	done
 
-endif # ! Windows
+endif # ! non-bash
 
 endif # ! compiling a specific program module
diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf
index 5559482ab9..13c008256e 100644
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -26,7 +26,7 @@ ifeq ($(HB_DYNLIB),yes)
    HB_CDYNLIB=-DHB_DYNLIB
 endif
 
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 
 # There is a conflict with the use of '\' and '/' characters
 # The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
diff --git a/harbour/config/wce/install.cf b/harbour/config/wce/install.cf
index 3663b6ee03..1be3419db4 100644
--- a/harbour/config/wce/install.cf
+++ b/harbour/config/wce/install.cf
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
 
 else
 
-ifeq ($(SHLVL),) # NT shell
+ifeq ($(SHLVL),) # non-bash
 
 INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
 
diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf
index a92da912af..b96ab5f14e 100644
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -90,7 +90,7 @@ ARFLAGS = $(HB_USER_AFLAGS)
 RANLIB = $(HB_CCPREFIX)ranlib
 
 ifeq ($(AR_RULE),)
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@
 else
 LIB_DIR_DOS_ = $(LIB_DIR)/$@
diff --git a/harbour/config/win/dir.cf b/harbour/config/win/dir.cf
index 59e8f79252..e56a598784 100644
--- a/harbour/config/win/dir.cf
+++ b/harbour/config/win/dir.cf
@@ -4,7 +4,7 @@
 
 ifeq ($(PM),) # Only traverse directories if not compiling a specific module
 
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 
 ifeq ($(DIRS),) # Empty directory list
 DIR_RULE =\
@@ -25,6 +25,6 @@ DIR_RULE =\
 	  fi \
 	done
 
-endif # ! Windows
+endif # ! non-bash
 
 endif # ! compiling a specific program module
diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf
index 94dcdb850c..1086f15f05 100644
--- a/harbour/config/win/global.cf
+++ b/harbour/config/win/global.cf
@@ -22,7 +22,7 @@ ifeq ($(HB_DYNLIB),yes)
    HB_CDYNLIB=-DHB_DYNLIB
 endif
 
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 
 # There is a conflict with the use of '\' and '/' characters
 # The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
diff --git a/harbour/config/win/install.cf b/harbour/config/win/install.cf
index ded92c0a6a..1be3419db4 100644
--- a/harbour/config/win/install.cf
+++ b/harbour/config/win/install.cf
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
 
 else
 
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 
 INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
 
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 74e02782b7..94dfcfc286 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -99,7 +99,7 @@ ARFLAGS = $(HB_USER_AFLAGS)
 RANLIB = $(HB_CCPREFIX)ranlib
 
 ifeq ($(AR_RULE),)
-ifeq ($(SHLVL),) # NT Shell
+ifeq ($(SHLVL),) # non-bash
 LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@
 else
 LIB_DIR_DOS_ = $(LIB_DIR)/$@