winnt-more-makefile-fixes-for-cvs-head-20010906