Makestg2 update for single binary support