Merge "Continue using the real make if -C is used"