BUGFIX: Fix environment variable checking

Fixed issue wherein environment variable values were not being
correctly propagated to the Makefile.