Updated makefile paths to target the bundled tools.