rework the 2.6 Makefile to match the 2.4 one,