Respect output-dir command line argument, and now ignore the environmental
variable.