moved } to outside #ifdef
have make_command_line indicate space in args