copy of 2.2 Makefile plus changes