Makefile: use short git tag; bump to v21.