Changed default PREFIX.
Revert some of the NAO changes to the Makefiles.
Another small Makefile fix.
More Makefile fixes