# HG changeset patch
# User dholmes
# Date 1363239680 14400
# Node ID 19a59a13b3ef2fa8748bbdfcd8b223680d8da772
# Parent  b35d986ff2760a6b3b6393b549560250f46e84da
8009428: Revert changes to $ substitution performed as part of nashorn integration
Reviewed-by: alanb, erikj

diff -r b35d986ff276 -r 19a59a13b3ef common/makefiles/MakeBase.gmk
--- a/common/makefiles/MakeBase.gmk	Wed Mar 06 08:37:27 2013 -0800
+++ b/common/makefiles/MakeBase.gmk	Thu Mar 14 01:41:20 2013 -0400
@@ -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