Rework Makefile, two fixes for Mac/homebrew.