handle puppet more flexibly
support for prefix-like make command, general functions for combining it with filename + line number