[PATCH] toplevel: fixes for in-tree libiconv

[DJ Delorie]

> Thanks.  I don't have write access, could a toplevel maintainer please
> commit?

Which repos do you not have access to?  Also, did you address Jeff's
comment?

> How was this patch tested?  I don't see anything glaringly wrong, but
> stranger things have happened.
> 
> I think just a bootstrap check is fine here (rather than a bootstrap +
> regression test).  If you could bootstrap with and without an in-tree
> libiconv it'd be appreciated.
> 
> Jeff