Bug 4805/dev/make file edition convergent