From 6fc5a5f9eda8496ca601a8db2db32b4c8e29f2ff Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sat, 27 Mar 2021 17:14:33 -0600
Subject: don't all-caps MAKEFLAGS

---
 src/makefile/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/makefile/mod.rs b/src/makefile/mod.rs
index 23243e4..0304bb7 100644
--- a/src/makefile/mod.rs
+++ b/src/makefile/mod.rs
@@ -24,7 +24,7 @@ use token::{tokenize, Token, TokenString};
 
 enum MacroSource {
     File,
-    CommandLineOrMAKEFLAGS,
+    CommandLineOrMakeflags,
     Environment,
     Builtin,
 }
@@ -68,7 +68,7 @@ impl<'a> Makefile<'a> {
                 macros.insert(
                     name.into(),
                     (
-                        MacroSource::CommandLineOrMAKEFLAGS,
+                        MacroSource::CommandLineOrMakeflags,
                         TokenString::text(value),
                     ),
                 );
@@ -325,7 +325,7 @@ impl<'a> Makefile<'a> {
 
                         match self.macros.get(name) {
                             // We always let command line or MAKEFLAGS macros override macros from the file.
-                            Some((MacroSource::CommandLineOrMAKEFLAGS, _)) => continue,
+                            Some((MacroSource::CommandLineOrMakeflags, _)) => continue,
                             // We let environment variables override macros from the file only if the command-line argument to do that was given
                             Some((MacroSource::Environment, _))
                                 if self.args.environment_overrides =>
-- 
cgit v1.2.3