Build scripts: Change the order of vars for the make command