Revert last change since it breaks running the test suite
when builddir is different from srcdir.
5 files changed