Allow output_dir to be specified as input.

The command already offers output_dir as a command-line option, but
any supplied value was ignored.  Now it will be used if provided.