Remove directory hacks from Makefile