Fix cmos-files-y for relative paths
authorPatrick Georgi <patrick.georgi@secunet.com>
Tue, 8 Feb 2011 08:37:47 +0000 (08:37 +0000)
committerPatrick Georgi <patrick.georgi@coresystems.de>
Tue, 8 Feb 2011 08:37:47 +0000 (08:37 +0000)
Thanks to Josef Kellermann <seppk@arcor.de> for reporting the issue.
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Acked-by: Patrick Georgi <patrick.georgi@secunet.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6337 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

Makefile

index f5aa73080088b3581de4622a4ce332bb1f732753..35ca0c517ec5229eb8ff88a24c6676d89aa5544d 100644 (file)
--- 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:=)) \