MAKEOPTS to OptionsNG

Import commit 2e8767360afa6f96a384a7d02a2f3275d0b1e419 from williambr