diff --git a/Makefile b/Makefile
index f5aa730800..35ca0c517e 100644
--- a/Makefile
+++ b/Makefile
@@ -208,10 +208,10 @@ includemakefiles= \
 			$$(subst $(top)/,, \
 			$$(abspath $$(addprefix $(dir $(1)),$$($(type)-y)))))) \
 	$(foreach file,$(cbfs-files-y), \
-		$(if $(wildcard $(dir $(1))$$($(file)-file)), \
-			$(eval tmp-cbfs-file:= $(wildcard $(dir $(1))$$($(file)-file))), \
-			$(eval tmp-cbfs-file:= $$($(file)-file))) \
-		$(eval cbfs-files += $(tmp-cbfs-file)|$(file)|$$($(file)-type)|$$($(file)-position)) \
+		$(if $(wildcard $(dir $(1))$($(file)-file)), \
+			$(eval tmp-cbfs-file:= $(wildcard $(dir $(1))$($(file)-file))), \
+			$(eval tmp-cbfs-file:= $($(file)-file))) \
+		$(eval cbfs-files += $(tmp-cbfs-file)|$(file)|$($(file)-type)|$($(file)-position)) \
 		$(eval $(file)-name:=) \
 		$(eval $(file)-type:=) \
 		$(eval $(file)-position:=)) \