- Adapt test-linedir-r.patch so that it fixes Makefile.in and works even though autogen.sh is not run.
- Fix use of awk in one of the tests