Fixes for ticket:35, allowing use of BSD make instead of GNU make.