1 files changed, 8 insertions, 7 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index d6aa008..7e85f3a 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -39,13 +39,14 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(const char* l,
     }
   mf->AddDefinition("BORLAND", "1");
   mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
-  mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32");
-  std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT");
-  setMakeProgram += "/Modules/CMakeBorlandFindMake.cmake";
-  mf->ReadListFile(0, setMakeProgram.c_str());
-  mf->AddDefinition("CMAKE_MAKE_PROGRAM", "make");
-  
-  
+  mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); 
+  if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")
+     || cmSystemTools::IsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM")))
+    {
+    std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT");
+    setMakeProgram += "/Modules/CMakeBorlandFindMake.cmake";
+    mf->ReadListFile(0, setMakeProgram.c_str());
+    }
   this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf);
 }