Updated to Make/Rake builds to fix CI build