Fix contrib/xml2 makefile to not override CFLAGS, and in passing make it