gen makefile.diff correctly this time (openjdk7)