Update makesystem for fuel-main repo