Ensure Makefile runs on fresh installation
Remove carriage returns
Fixes to make it compile under Linux