Trimmed trailing whitespace
Various makes do CURDIR differently
Works with newer version