Makefile virtualenv handling improvements