Fix issue with MANIFEST install block; remove unused Makefile variants