Misc Makefile love

Replace grep+sed pipeline with a single portable awk incantation
Replace MANIFEST + MANIFEST-pre targets with one that doesn't use a tmp file