Updated Makevars and Makevars.win