Fix make dist for out-of-tree builds.
Merge branch 'bug2190' into bug2193