Formerly main.c.~95~

diff --git a/main.c b/main.c
index 3cb3f35696ed313f25dbdf47d7d46ddea56b766b..7fb4026d4ce8393af3c94c6d91404593a7c9a6e4 100644 (file)
--- 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);
 }
 \f