OS X packaging Makefile changes - take 2

Incorporating the review comments and cleaned up the commits.