summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2011-05-20 23:31:41 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2011-05-20 23:31:41 +0000
commit29ddbb813fecc42ebb40aa52e5dd73696027d791 (patch)
treebd031e45accca4e8d1d5b28d08e396d09fa4769a
parent64ccc3b80348d5d8e6b8f698ec5ef2b596a46153 (diff)
Handle absolute source file paths
We used to fail there because we unconditionally prefixed the relative directory where it was referenced. Tested in various scenarios: - obj=build - obj=../obj - obj=$PWD/../obj - obj=/some/other/absolute/path - obj=/./some/other/absolute/path In-tree relative paths still work as before, the only change in behaviour is when a source file name (as specified in one of the *-y variables) starts with "/". Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Acked-by: Patrick Georgi <patrick@georgi-clan.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6606 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 33e35738bb..04fbb02612 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ includemakefiles= \
$(foreach class,$(classes), \
$(eval $(class)-srcs+= \
$$(subst $(top)/,, \
- $$(abspath $$(addprefix $(dir $(1)),$$($(class)-y)))))) \
+ $$(abspath $$(subst $(dir $(1))/,/,$$(addprefix $(dir $(1)),$$($(class)-y))))))) \
$(foreach special,$(special-classes), \
$(foreach item,$($(special)-y), $(call $(special)-handler,$(dir $(1)),$(item)))) \
$(eval subdirs+=$$(subst $(CURDIR)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))