make support: updated for multiple calls; fixed issues on darwin