Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorkatleman
Tue, 02 Apr 2013 15:29:18 -0700
changeset 16425 aec7eec37b03
parent 16422 8c92e0092f61 (diff)
parent 16424 d955df81d716 (current diff)
child 16461 c5744143ecd0
Merge
--- a/.hgtags-top-repo	Tue Apr 02 14:13:06 2013 -0400
+++ b/.hgtags-top-repo	Tue Apr 02 15:29:18 2013 -0700
@@ -204,3 +204,4 @@
 907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80
 145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81
 29153d0df68f84162ffe8c2cf4f402a3f2245e85 jdk8-b82
+466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83
--- a/common/makefiles/MakeBase.gmk	Tue Apr 02 14:13:06 2013 -0400
+++ b/common/makefiles/MakeBase.gmk	Tue Apr 02 15:29:18 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
jdk-sandbox