Add the - between version and architecture only if the architecture actually exists.