HPCC-9869 Make packages easier to manage on multiple targets

Fix build break from previous merge

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>