Add the #1680 fix for GNU make versions