automake: further relocation fixes