I added architecture detection to the Makefiles.