[cvs-nhc98] Minor config changes for hmake.