changeset 885:b938d5ee29c3

Merge
author jlaskey
date Fri, 15 Mar 2013 11:50:23 -0300
parents 19a59a13b3ef (diff) 1d38d30196be (current diff)
children fe5a388bf8fe
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/makefiles/MakeBase.gmk	Fri Mar 08 14:44:31 2013 -0400
+++ b/common/makefiles/MakeBase.gmk	Fri Mar 15 11:50:23 2013 -0300
@@ -51,9 +51,8 @@
 		     -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