fix, don't fiddle with the VPATH

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'bld/dist' into next

* bld/dist:
  fix, don't fiddle with the VPATH
Merge branch 'next'

* next:
  fix, don't fiddle with the VPATH