Reorganize Make.inc to do detection earlier