Replaced PWD with CURDIR in makefile
Merging with trunk