update makevars for new source structure