Change generated install to support variable options.
Correct generated comment on output variables.