Updated make files to be system-specific