Merge change 3849

* changes:
  Fix build error due to bad path generation in makefile for generated tools. Implemented by JoeO