summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1993-09-09 00:14:18 +0000
committerRoland McGrath <roland@redhat.com>1993-09-09 00:14:18 +0000
commit16667d15e01f7f139be21a09df1ca0971af07cbc (patch)
tree8e5592da6436722b6be3b346af52e956599f2d50
parentb9337d31434ace16b2faf7755deb313e5b3fff43 (diff)
downloadgunmake-16667d15e01f7f139be21a09df1ca0971af07cbc.tar.gz
Formerly main.c.~95~
-rw-r--r--main.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/main.c b/main.c
index 3cb3f35..7fb4026 100644
--- a/main.c
+++ b/main.c
@@ -1656,7 +1656,15 @@ define_makeflags (all, makefile)
with a long option `--foo', since removing the
first dash would result in the bogus `-foo'. */
flagstring[1] == '-' ? flagstring : &flagstring[1],
- o_env, 0);
+ /* This used to use o_env, but that lost when a
+ makefile defined MAKEFLAGS. Makefiles set
+ MAKEFLAGS to add switches, but we still want
+ to redefine its value with the full set of
+ switches. Of course, an override or command
+ definition will still take precedence. */
+ o_file, 0);
+ /* Since MFLAGS is not parsed for flags, there is no reason to
+ override any makefile redefinition. */
(void) define_variable ("MFLAGS", 6, flagstring, o_env, 0);
}