Revert "fix, don't fiddle with the VPATH"

This reverts commit 89f1819d48352c278e05205d112c2e4606518147.
Merge branch 'bld/dist'

* bld/dist:
  Revert "fix, don't fiddle with the VPATH"