Makefile: reworked SUBARCH definition