Merge topic 'makefile-color-when-needed'

bfb9d34f Makefile: Print color escapes only when necessary

Source/cmSystemTools.cxx

@@ -2402,7 +2402,7 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message,
     assumeTTY = 0;
     }
 
-  if(enabled)
+  if(enabled && color != cmsysTerminal_Color_Normal)
     {
     // Print with color.  Delay the newline until later so that
     // all color restore sequences appear before it.