Makefile update:
All variants now set the 'VARIANT' variable which is then used
to distinguish the different variants