backport makefile change