convert Makefile patch for upstream Makefile changes