Since we have no time left to try alternatives, Arnaud allowed the commit of the patch as is for 3.4.2 so it's in, we'll try something better for 3.4.3. Laurent PS: I removed a single tab line signaled by emacs on ada/Make-lang.in in the commit.