aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlana <none@none>2013-03-26 12:00:08 -0700
committerlana <none@none>2013-03-26 12:00:08 -0700
commitfe8e99b2988d447f3e26a7d453fcead6a0d8897b (patch)
treea4ed56e5d817f14080e52c8f42e0c7aa5ddc9254
parent694850ea37efdff4b4f084c2916180dd1bfbbdeb (diff)
parentdd065d6cc7a1b857fcc8488eea0d7fcfc58f5d63 (diff)
Merge
-rw-r--r--common/makefiles/MakeBase.gmk3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/makefiles/MakeBase.gmk b/common/makefiles/MakeBase.gmk
index 4c1ecc8..708cbad 100644
--- a/common/makefiles/MakeBase.gmk
+++ b/common/makefiles/MakeBase.gmk
@@ -51,9 +51,8 @@ decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-
-e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-e 's|X00|X|g' | tr '\n' '$2'
-# Subst in an extra $ to prevent it from disappearing.
define ListPathsSafely_If
- $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1))))))
+ $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
endef
define ListPathsSafely_Printf