Merge

Mon, 01 Apr 2013 21:34:33 -0700

author
lana
date
Mon, 01 Apr 2013 21:34:33 -0700
changeset 663
a1bb1a0df1fa
parent 659
d409b4cdb74f
parent 662
477d18509ecb
child 666
01f631f89fa3
child 680
bcbdbcfe7ed8

Merge

     1.1 --- a/common/makefiles/MakeBase.gmk	Thu Mar 28 10:53:50 2013 -0700
     1.2 +++ b/common/makefiles/MakeBase.gmk	Mon Apr 01 21:34:33 2013 -0700
     1.3 @@ -51,9 +51,8 @@
     1.4  		     -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
     1.5  		     -e 's|X00|X|g' | tr '\n' '$2'
     1.6  
     1.7 -# Subst in an extra $ to prevent it from disappearing.
     1.8  define ListPathsSafely_If
     1.9 -    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1))))))
    1.10 +    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
    1.11  endef
    1.12  
    1.13  define ListPathsSafely_Printf

mercurial