mirror of
https://github.com/mirror/make.git
synced 2025-01-16 15:20:39 +08:00
Formerly read.c.~50~
This commit is contained in:
parent
6ef5854e47
commit
5893545370
39
read.c
39
read.c
@ -383,6 +383,28 @@ read_makefile (filename, type)
|
||||
}
|
||||
continue;
|
||||
}
|
||||
else if (word1eq ("override", 8))
|
||||
{
|
||||
p2 = next_token (p + 8);
|
||||
if (p2 == 0)
|
||||
makefile_error (filename, lineno, "empty `override' directive");
|
||||
if (!strncmp (p2, "define", 6))
|
||||
{
|
||||
if (ignoring)
|
||||
in_ignored_define = 1;
|
||||
else
|
||||
{
|
||||
unsigned int len;
|
||||
p2 = end_of_token (p2);
|
||||
p = find_next_token (&p2, &len);
|
||||
lineno = do_define (p, len, o_override,
|
||||
lineno, infile, filename);
|
||||
}
|
||||
}
|
||||
else if (!ignoring && !try_variable_definition (p2, o_override))
|
||||
makefile_error (filename, lineno, "empty `override' directive");
|
||||
}
|
||||
|
||||
|
||||
if (ignoring)
|
||||
/* Ignore the line. We continue here so conditionals
|
||||
@ -420,23 +442,6 @@ read_makefile (filename, type)
|
||||
|
||||
continue;
|
||||
}
|
||||
else if (word1eq ("override", 8))
|
||||
{
|
||||
p2 = next_token (p + 8);
|
||||
if (p2 == 0)
|
||||
makefile_error (filename, lineno, "empty `override' directive");
|
||||
if (!strncmp (p2, "define", 6))
|
||||
{
|
||||
unsigned int len;
|
||||
p2 = end_of_token (p2);
|
||||
p = find_next_token (&p2, &len);
|
||||
lineno = do_define (p, len, o_override,
|
||||
lineno, infile, filename);
|
||||
}
|
||||
else if (!try_variable_definition (p2, o_override))
|
||||
makefile_error (filename, lineno,
|
||||
"Empty `override' directive");
|
||||
}
|
||||
else if (word1eq ("export", 6))
|
||||
{
|
||||
struct variable *v;
|
||||
|
Loading…
Reference in New Issue
Block a user