rework for pmake 2.1