Enhancement in the make scripts for compatibility with Mac.