fix makefile for env consolidation