Created attachment 1852 [details]
Make _remove work correctly

If the _remove variable suffix is used on a variable that is then used multiple times within a recipe, the _remove will only apply to the first use of the variable. E.g., add the following to any recipe: 

FOO = "foo bar"
FOO_remove = "bar"
FOO_FOO = "${FOO} ${FOO}"

do_foo_foo[nostamp] = "1"
do_foo_foo() {
        bbnote "FOO_FOO: ${FOO_FOO}"
}
addtask foo_foo

and look at the output from the foo_foo task. It will say:

NOTE: FOO_FOO: foo foo bar

rather than the expected:

NOTE: FOO_FOO: foo foo

I have attached a patch that I got from Richard Purdie when I fist discovered the problem. It does solve the problem, but I think he was not happy with the solution.