Fix makefile for env consolidation