changeset 16421:20fe195f45a1

Merge
author lana
date Tue, 26 Mar 2013 12:00:08 -0700
parents bcebd3fdefc9 0fe6f1afaf7c
children 8c92e0092f61
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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