# HG changeset patch
# User lana
# Date 1364324408 25200
# Node ID 20fe195f45a199d48ec20489695f8c92d89c038f
# Parent  bcebd3fdefc91abb9d7fa0c5af6211b3f8720da6# Parent  0fe6f1afaf7cb1b64917cfea1850334cb3bb6708
Merge

diff -r bcebd3fdefc9 -r 20fe195f45a1 common/makefiles/MakeBase.gmk
--- a/common/makefiles/MakeBase.gmk	Wed Jul 05 18:46:58 2017 +0200
+++ b/common/makefiles/MakeBase.gmk	Tue Mar 26 12:00:08 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