diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1547548f6d..7c38485cf5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 20:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/dos/dir.cf
+  * config/win/dir.cf
+  * config/linux/dir.cf
+  * config/os2/dir.cf
+  * config/wce/dir.cf
+    * DIR_LIST -> DIRS_OS
+    * DIR_MAKE -> MK_OS
+
 2009-07-14 20:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/dos/install.cf
   * config/win/install.cf
diff --git a/harbour/config/dos/dir.cf b/harbour/config/dos/dir.cf
index b5c7acd996..d5c47cd1ce 100644
--- a/harbour/config/dos/dir.cf
+++ b/harbour/config/dos/dir.cf
@@ -16,19 +16,19 @@ ifeq ($(SHLVL),) # non-bash
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 # It causes that every commands will be separated by LF
 define dir_mk
-$(DIR_MAKE) -C $(file) $@
+$(MK_OS) -C $(file) $@
 
 endef
 
-DIR_LIST = $(subst /,\,$(DIRS))
-DIR_MAKE = $(subst /,\,$(MK))
-DIR_RULE = $(foreach file, $(DIR_LIST), $(dir_mk))
+DIRS_OS = $(subst /,\,$(DIRS))
+MK_OS = $(subst /,\,$(MK))
+DIR_RULE = $(foreach file, $(DIRS_OS), $(dir_mk))
 
 else  # bash
 
-DIR_LIST = $(subst \,/,$(DIRS))
+DIRS_OS = $(subst \,/,$(DIRS))
 DIR_RULE =\
-	@for d in $(DIR_LIST); do \
+	@for d in $(DIRS_OS); do \
 	  if [ -d $$d ]; then \
 	    $(MAKE) -C $$d $@; \
 	  fi \
diff --git a/harbour/config/linux/dir.cf b/harbour/config/linux/dir.cf
index dcc7be27f4..179d9f7b6f 100644
--- a/harbour/config/linux/dir.cf
+++ b/harbour/config/linux/dir.cf
@@ -12,9 +12,9 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
-DIR_MAKE = $(subst /,\,$(MK))
-DIR_LIST = $(subst /,\,$(DIRS))
-DIR_RULE = $(COMSPEC) /C for %d in ($(DIR_LIST)) do $(DIR_MAKE) -C %d $@
+MK_OS = $(subst /,\,$(MK))
+DIRS_OS = $(subst /,\,$(DIRS))
+DIR_RULE = $(COMSPEC) /C for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@
 
 else  # bash
 
diff --git a/harbour/config/os2/dir.cf b/harbour/config/os2/dir.cf
index dcc7be27f4..179d9f7b6f 100644
--- a/harbour/config/os2/dir.cf
+++ b/harbour/config/os2/dir.cf
@@ -12,9 +12,9 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
-DIR_MAKE = $(subst /,\,$(MK))
-DIR_LIST = $(subst /,\,$(DIRS))
-DIR_RULE = $(COMSPEC) /C for %d in ($(DIR_LIST)) do $(DIR_MAKE) -C %d $@
+MK_OS = $(subst /,\,$(MK))
+DIRS_OS = $(subst /,\,$(DIRS))
+DIR_RULE = $(COMSPEC) /C for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@
 
 else  # bash
 
diff --git a/harbour/config/wce/dir.cf b/harbour/config/wce/dir.cf
index dcc7be27f4..179d9f7b6f 100644
--- a/harbour/config/wce/dir.cf
+++ b/harbour/config/wce/dir.cf
@@ -12,9 +12,9 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
-DIR_MAKE = $(subst /,\,$(MK))
-DIR_LIST = $(subst /,\,$(DIRS))
-DIR_RULE = $(COMSPEC) /C for %d in ($(DIR_LIST)) do $(DIR_MAKE) -C %d $@
+MK_OS = $(subst /,\,$(MK))
+DIRS_OS = $(subst /,\,$(DIRS))
+DIR_RULE = $(COMSPEC) /C for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@
 
 else  # bash
 
diff --git a/harbour/config/win/dir.cf b/harbour/config/win/dir.cf
index dcc7be27f4..179d9f7b6f 100644
--- a/harbour/config/win/dir.cf
+++ b/harbour/config/win/dir.cf
@@ -12,9 +12,9 @@ else
 
 ifeq ($(SHLVL),) # non-bash
 
-DIR_MAKE = $(subst /,\,$(MK))
-DIR_LIST = $(subst /,\,$(DIRS))
-DIR_RULE = $(COMSPEC) /C for %d in ($(DIR_LIST)) do $(DIR_MAKE) -C %d $@
+MK_OS = $(subst /,\,$(MK))
+DIRS_OS = $(subst /,\,$(DIRS))
+DIR_RULE = $(COMSPEC) /C for %d in ($(DIRS_OS)) do $(MK_OS) -C %d $@
 
 else  # bash