# HG changeset patch
# User lana
# Date 1364877273 25200
# Node ID 8c92e0092f619384f8b6b1c8d10e58ce967b4d69
# Parent  6b0f3fb4a0d6429bdb8c72c354d6e1fff885c50b# Parent  20fe195f45a199d48ec20489695f8c92d89c038f
Merge

diff -r 6b0f3fb4a0d6 -r 8c92e0092f61 common/makefiles/MakeBase.gmk
--- 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