[This looks more or less right, although I don't have time at the moment to see whether it works here. -kingdon, Nov 1997] From: Mike Glendinning Subject: Minor bug-fix patch to CVS 1.9.20 To: bug-cvs@prep.ai.mit.edu Date: Wed, 19 Nov 1997 20:49:07 +0000 (GMT) . . . The specification of the output directories for the "diff" files didn't take into account the two different build targets (both "WinRel" and "WinDebug"). There are still a number of compiler and NMAKE warnings under Windows NT, but it does seem to work! . . . Wed Nov 19 18:25:03 1997 Mike Glendinning * Corrected minor errors in "cvsnt.mak". *** cvsnt.mak.orig Mon Nov 17 05:29:16 1997 --- cvsnt.mak Wed Nov 19 19:44:48 1997 *************** *** 4244,4255 **** {$(INCLUDE)}"\sys\Stat.h"\ ".\windows-NT\ndir.h"\ INTDIR_SRC=.\WinRel\2 "$(INTDIR_SRC)" : if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)" - !IF "$(CFG)" == "cvsnt - Win32 Release" - # PROP Intermediate_Dir "WinRel\2" ".\WinRel\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_SRC)" --- 4244,4255 ---- {$(INCLUDE)}"\sys\Stat.h"\ ".\windows-NT\ndir.h"\ + !IF "$(CFG)" == "cvsnt - Win32 Release" + INTDIR_SRC=.\WinRel\2 "$(INTDIR_SRC)" : if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)" # PROP Intermediate_Dir "WinRel\2" ".\WinRel\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_SRC)" *************** *** 4260,4265 **** --- 4260,4269 ---- !ELSEIF "$(CFG)" == "cvsnt - Win32 Debug" + INTDIR_SRC=.\WinDebug\2 + "$(INTDIR_SRC)" : + if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)" + # PROP Intermediate_Dir "WinDebug\2" ".\WinDebug\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_SRC)" *************** *** 4431,4442 **** DEP_CPP_VERSI=\ ".\windows-NT\config.h"\ INTDIR_SRC=.\WinRel\2 "$(INTDIR_SRC)" : if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)" - !IF "$(CFG)" == "cvsnt - Win32 Release" - # PROP Intermediate_Dir "WinRel\2" ".\WinRel\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_SRC)" --- 4435,4446 ---- DEP_CPP_VERSI=\ ".\windows-NT\config.h"\ + !IF "$(CFG)" == "cvsnt - Win32 Release" + INTDIR_SRC=.\WinRel\2 "$(INTDIR_SRC)" : if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)" # PROP Intermediate_Dir "WinRel\2" ".\WinRel\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_SRC)" *************** *** 4448,4453 **** --- 4452,4461 ---- !ELSEIF "$(CFG)" == "cvsnt - Win32 Debug" # PROP Intermediate_Dir "WinDebug\2" + + INTDIR_SRC=.\WinDebug\2 + "$(INTDIR_SRC)" : + if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)" ".\WinDebug\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_SRC)" $(CPP) /nologo /MLd /W3 /Gm /GX /Zi /Ob1 /I "windows-NT" /I "lib" /I "src"\