[coreboot] [commit] r6337 - trunk

[repository service]

Author: oxygene
Date: Tue Feb  8 09:37:47 2011
New Revision: 6337
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6337

Log:
Fix cmos-files-y for relative paths

Thanks to Josef Kellermann <seppk at arcor.de> for reporting the issue.
Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
Acked-by: Patrick Georgi <patrick.georgi at secunet.com>

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Feb  8 03:36:39 2011	(r6336)
+++ trunk/Makefile	Tue Feb  8 09:37:47 2011	(r6337)
@@ -208,10 +208,10 @@
 			$$(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:=)) \