Reorganize Makefile for clarity, and add a few comments. While here, regenerate the patches with makepatch. No functional changes.
