Core:Fix:Improve make dist with patch from Roy Rankin