mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-10-23 20:59:54 +00:00
Formerly read.c.~54~
This commit is contained in:
parent
ded09420ad
commit
db6a102206
1 changed files with 5 additions and 3 deletions
8
read.c
8
read.c
|
@ -404,7 +404,9 @@ read_makefile (filename, type)
|
||||||
lineno, infile, filename);
|
lineno, infile, filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!ignoring && !try_variable_definition (p2, o_override))
|
else if (!ignoring
|
||||||
|
&& !try_variable_definition (filename, lineno,
|
||||||
|
p2, o_override))
|
||||||
makefile_error (filename, lineno, "empty `override' directive");
|
makefile_error (filename, lineno, "empty `override' directive");
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
|
@ -454,7 +456,7 @@ read_makefile (filename, type)
|
||||||
p2 = next_token (p + 6);
|
p2 = next_token (p + 6);
|
||||||
if (*p2 == '\0')
|
if (*p2 == '\0')
|
||||||
export_all_variables = 1;
|
export_all_variables = 1;
|
||||||
v = try_variable_definition (p2, o_file);
|
v = try_variable_definition (filename, lineno, p2, o_file);
|
||||||
if (v != 0)
|
if (v != 0)
|
||||||
v->export = v_export;
|
v->export = v_export;
|
||||||
else
|
else
|
||||||
|
@ -554,7 +556,7 @@ read_makefile (filename, type)
|
||||||
free (pattern);
|
free (pattern);
|
||||||
}
|
}
|
||||||
#undef word1eq
|
#undef word1eq
|
||||||
else if (try_variable_definition (p, o_file))
|
else if (try_variable_definition (filename, lineno, p, o_file))
|
||||||
/* This line has been dealt with. */
|
/* This line has been dealt with. */
|
||||||
;
|
;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue