to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.