Roll $makeflags into $make, use it consistently