make-config: reorganize code to make it clear that --show-defaults can't be combined with custom key=value

The key=value arguments could only be specified after specifying an ini file,
and that couldn't be combined with --show-defaults.