OS X packaging Makefile changes - take 2

Incorporated the review comments and cleaned up the commits.