[cvs-nhc98] patch applied (yhc): Massive changes to the Make library