marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Fix expansion of '$$' in make variables. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alexandre Julliard 2015-10-26 14:39:06 +09:00
parent a9522d52fe
commit 581be47a45
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/makedep.c
View File

@ -1518,23 +1518,21 @@ static char *get_expanded_make_variable( struct makefile *make, const char *name
var = get_make_variable( make, p + 2 );
tmp = replace_substr( expand, p, end - p, var ? var : "" );
free( var );
/* switch to the new string */
p = tmp + (p - expand);
free( expand );
expand = tmp;
}
else if (p[1] == '{') /* don't expand ${} variables */
{
if (!(end = strchr( p + 2, '}' ))) fatal_error( "syntax error in '%s'\n", expand );
p = end + 1;
continue;
}
else if (p[1] == '$')
{
tmp = replace_substr( expand, p, 2, "$" );
p += 2;
}
else fatal_error( "syntax error in '%s'\n", expand );
/* switch to the new string */
p = tmp + (p - expand);
free( expand );
expand = tmp;
}
/* consider empty variables undefined */