Revert "* Don't override environment variables in Makefile"