Add a missing part of bug 7311's makefile.nmake tweaks