Re-work Make.sh after pickett filename reorg.

Things get simpler now with everything buildable from the top-level directory. But fix make.sh so it does the right thing.