changeset 723:a1bb1a0df1fa

Merge
author lana
date Mon, 01 Apr 2013 21:34:33 -0700
parents d409b4cdb74f 477d18509ecb
children 01f631f89fa3 bcbdbcfe7ed8
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/makefiles/MakeBase.gmk	Thu Mar 28 10:53:50 2013 -0700
+++ b/common/makefiles/MakeBase.gmk	Mon Apr 01 21:34:33 2013 -0700
@@ -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