Adjusted Makefile modifications based on Joel's pull request.