Fix make install with out-of-tree.
Again reinstate b3e3f759c317a.