Fix bug in genOutputFilenameFunc: the -keep-blah-files options weren't
being considered for the final phase.  Upshot: -keep-hc-files wasn't
working in --make mode (see driver060 & driver061 tests).

MERGE TO STABLE