summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1993-01-14 19:26:47 +0000
committerRoland McGrath <roland@redhat.com>1993-01-14 19:26:47 +0000
commit5893545370c56ffb2f20c06611bc18f1311ae10c (patch)
treef72aee60828160c3e0dd2410d034b45682e96635
parent6ef5854e472109ee58002aabc2956621f3ac55ba (diff)
downloadgunmake-5893545370c56ffb2f20c06611bc18f1311ae10c.tar.gz
Formerly read.c.~50~
-rw-r--r--read.c39
1 files changed, 22 insertions, 17 deletions
diff --git a/read.c b/read.c
index d9a1b4e..72b3fe3 100644
--- a/read.c
+++ b/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;