patches applied to yi / Makefile