# HG changeset patch
# User lana
# Date 1364877273 25200
# Node ID a1bb1a0df1facba7ed2c868bbe129865b1908a54
# Parent  d409b4cdb74f65065da2d56853ec2d91169a7ec6# Parent  477d18509ecb8fba2ebb2b3e54095d9e244f7069
Merge

diff -r d409b4cdb74f -r a1bb1a0df1fa 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