Move all system.make-like files to their own subfolder. Stop tracking system.make itself. Make the Makefile choose the right system.*.make file based on the host automatically.