Rebuilt make environment