diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 986ca6e04..dac1db4fc 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -120,15 +120,11 @@ endif
 ifneq ($(RELEASE_TOPS),)
 define  TOP_RULES_template
   RULES_TOP:=$$($(1))
-  ifneq ($$(CONFIG),$$($(1))/configure)
-    -include $$(strip $$($(1)))/configure/RULES_BUILD
-  endif
-  ifneq ($$(wildcard $$($(1))/cfg/RULES*),)
-  -include $$(wildcard $$($(1))/cfg/RULES*)
-  endif
+  -include $$(if $(patsubst $$($(1))/configure,,$$(CONFIG)),nonexistantFilename, \
+         $$(strip $$($(1)))/configure/RULES_BUILD)
+  -include $$(wildcard $$($(1))/cfg/RULES*) nonexistantFilename
 endef
-$(foreach top, $(RELEASE_TOPS), \
-       $(eval $(call TOP_RULES_template,$(top)) ))
+$(foreach top, $(RELEASE_TOPS), $(eval $(call TOP_RULES_template,$(top)) ))
 endif
 #---------------------------------------------------------------
 
diff --git a/configure/RULES_FILE_TYPE b/configure/RULES_FILE_TYPE
index 9589ca1f8..c17d9fe84 100644
--- a/configure/RULES_FILE_TYPE
+++ b/configure/RULES_FILE_TYPE
@@ -66,13 +66,7 @@ ifdef T_A
 
 define FILE_TYPE_template
 
-ifneq ($$(strip $$($(1)S_$$(ARCH_CLASS))),)
-  $(1)S += $$(subst -nil-,,$$($(1)S_$$(ARCH_CLASS)))
-  else
-  ifdef $(1)S_DEFAULT
-    $(1)S += $$($(1)S_DEFAULT)
-  endif
-endif
+$(1)S += $(if $$(strip $$($(1)S_$$(ARCH_CLASS))),$$(subst -nil-,,$$($(1)S_$$(ARCH_CLASS))), $$($(1)S_DEFAULT))
 
 INSTALLS_$(1) = $$($(1)S:%=$$(INSTALL_$(1))/%)
 buildInstall : $$(INSTALLS_$(1))
@@ -92,6 +86,7 @@ endef
 
 $(foreach type, $(FILE_TYPE),$(eval $(call FILE_TYPE_template,$(strip $(type)))))
 
+
 endif
 #---------------------------------------------------------------
 
diff --git a/configure/RULES_TOP b/configure/RULES_TOP
index 01fb6d41e..76238fe95 100644
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -30,9 +30,7 @@ RELEASE_TOPS = $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops )
 ifneq ($(RELEASE_TOPS),)
 define TOP_RULES_template
   RULES_TOP:=$$($(1))
-  ifneq ($$(wildcard $$($(1))/cfg/RULES*),)
-  -include $$(wildcard $$($(1))/cfg/RULES*)
-  endif
+  -include $$(wildcard $$($(1))/cfg/RULES*) nonexistantFilename
 endef
 $(foreach top, $(RELEASE_TOPS), $(eval $(call TOP_RULES_template,$(top)) ))
 endif