Compatible with make-no-environ

Updated the make system to work with my make-no-environ branch.