* automake.in (%var_was_plus_eq): Rename as... (%var_type): this. (%def_type): Remove. (¯o_define): %var_type may now hold `', `+', or `:'. (%conditional, %am_vars, %content_lines): Rename as... (%var_value, %var_comment, %var_line): these.