Sweeten makefiles for variants