Move some variables to vars.mk