r20201: merge makefile changes from 3_0_24