Makevars change suggested by CRAN team