Make sure that mhmake and mhmake_dbg are using the same autodep filename in case mhmakeconf is not defined

2 files changed, 6 insertions, 3 deletions

diff --git a/tools/mhmake/src/util.cpp b/tools/mhmake/src/util.cpp
index 79a0424da..f16134551 100644
--- a/tools/mhmake/src/util.cpp
+++ b/tools/mhmake/src/util.cpp
@@ -591,8 +591,11 @@ void loadedmakefile::LoadMakefile()
     map<string,string>::const_iterator pIt=m_CommandLineVars.begin();

     while (pIt!=m_CommandLineVars.end())

     {

-      md5_update(&ctx, (uint8*)pIt->first.c_str(), pIt->first.size());

-      md5_update(&ctx, (uint8*)pIt->second.c_str(), pIt->second.size());

+      if (pIt->first!="MAKE")

+      {

+        md5_update(&ctx, (uint8*)pIt->first.c_str(), pIt->first.size());

+        md5_update(&ctx, (uint8*)pIt->second.c_str(), pIt->second.size());

+      }

       pIt++;

     }

     md5_update(&ctx, (uint8*)m_Makefile->GetFullFileName().c_str(), m_Makefile->GetFullFileName().size());

diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 5afe9aecf..8a2058539 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
 #define PLATFORM     "linux"

 #endif

 

-#define MHMAKEVER    "2.2.2"

+#define MHMAKEVER    "2.2.3"

 

 class makecommand

 {