Fixed typo in makefiles.
Update to build scripts.