windows: rename WINDIR -> WIN_DIR to follow the same change in Tcl

2 files changed, 32 insertions, 32 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 1e44bff..38ec132 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -528,7 +528,7 @@ install-pdbs:
 # Special case object file targets

 #---------------------------------------------------------------------

 

-$(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c

+$(TMP_DIR)\testMain.obj: $(WIN_DIR)\winMain.c

 	$(cc32) $(appcflags_nostubs) -DTK_TEST \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -539,13 +539,13 @@ $(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
 $(TMP_DIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c

 	$(cc32) $(appcflags_nostubs) -Fo$@ $?

 

-$(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c

+$(TMP_DIR)\tkWinTest.obj: $(WIN_DIR)\tkWinTest.c

 	$(cc32) $(appcflags_nostubs) -Fo$@ $?

 

 $(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c

 	$(cc32) $(appcflags_nostubs) -Fo$@ $?

 

-$(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c

+$(TMP_DIR)\winMain.obj: $(WIN_DIR)\winMain.c

 	$(cc32) $(appcflags_nostubs) \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -561,7 +561,7 @@ $(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
 	$(cc32) $(stubscflags) -Fo$@ $?

 

 

-$(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in

+$(TMP_DIR)\wish.exe.manifest: $(WIN_DIR)\wish.exe.manifest.in

 	@nmakehlp -s << $** >$@

 @MACHINE@	  $(MACHINE:IX86=X86)

 @TK_WIN_VERSION@  $(DOTVERSION).0.0

@@ -582,7 +582,7 @@ depend:
 	set TCL_LIBRARY=$(TCL_LIBRARY)

 	$(TCLSH) $(TCLTOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

 		-passthru:"-DBUILD_tk $(TK_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

-		$(WINDIR),$$(WINDIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) \

+		$(WIN_DIR),$$(WIN_DIR) $(TTKDIR),$$(TTKDIR) $(XLIBDIR),$$(XLIBDIR) \

 		$(BITMAPDIR),$$(BITMAPDIR) @<<

 $(TKOBJS)

 <<

diff --git a/win/rules.vc b/win/rules.vc
index 8c8c6d6..bf826ee 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -162,7 +162,7 @@ MKDIR   = mkdir
 # COMPATDIR - source directory that holds compatibility sources

 # DOCDIR - source directory containing documentation files

 # GENERICDIR - platform-independent source directory

-# WINDIR - Windows-specific source directory

+# WIN_DIR - Windows-specific source directory

 # TESTDIR - directory containing test files

 # TOOLSDIR - directory containing build tools

 # _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set

@@ -215,17 +215,17 @@ DEMODIR		= $(LIBDIR)\demos
 DEMODIR		= $(ROOT)\demos

 !endif

 !endif # ifndef DEMODIR

-# Do NOT enclose WINDIR in a !ifndef because Windows always defines

-# WINDIR env var to point to c:\windows!

-# TBD - This is a potentially dangerous conflict, rename WINDIR to

+# Do NOT enclose WIN_DIR in a !ifndef because Windows always defines

+# WIN_DIR env var to point to c:\windows!

+# TBD - This is a potentially dangerous conflict, rename WIN_DIR to

 # something else

-WINDIR		= $(ROOT)\win

+WIN_DIR		= $(ROOT)\win

 

 !ifndef RCDIR

-!if exist("$(WINDIR)\rc")

-RCDIR           = $(WINDIR)\rc

+!if exist("$(WIN_DIR)\rc")

+RCDIR           = $(WIN_DIR)\rc

 !else

-RCDIR           = $(WINDIR)

+RCDIR           = $(WIN_DIR)

 !endif

 !endif

 RCDIR = $(RCDIR:/=\)

@@ -1069,7 +1069,7 @@ TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
 

 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

-TCL_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

 

 !else # ! $(DOING_TCL)

 

@@ -1150,7 +1150,7 @@ WISH 		= $(OUT_DIR)\$(WISHNAME)
 TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

 TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

-TK_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+TK_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

 

 !else # effectively NEED_TK

 

@@ -1390,7 +1390,7 @@ cwarn = $(cwarn) -WX
 

 INCLUDES = $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES)

 !if !$(DOING_TCL) && !$(DOING_TK)

-INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)"

+INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WIN_DIR)" -I"$(COMPATDIR)"

 !endif

 

 # These flags are defined roughly in the order of the pre-reform

@@ -1562,20 +1562,20 @@ default-install-demos:
 default-clean:

 	@echo Cleaning $(TMP_DIR)\* ...

 	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

-	@echo Cleaning $(WINDIR)\nmakehlp.obj, nmakehlp.exe ...

-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

-	@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out

-	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

-	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

-	@echo Cleaning $(WINDIR)\_junk.pch ...

-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

-	@echo Cleaning $(WINDIR)\vercl.x, vercl.i ...

-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

-	@echo Cleaning $(WINDIR)\versions.vc, version.vc ...

-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

-	@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc

+	@echo Cleaning $(WIN_DIR)\nmakehlp.obj, nmakehlp.exe ...

+	@if exist $(WIN_DIR)\nmakehlp.obj del $(WIN_DIR)\nmakehlp.obj

+	@if exist $(WIN_DIR)\nmakehlp.exe del $(WIN_DIR)\nmakehlp.exe

+	@if exist $(WIN_DIR)\nmakehlp.out del $(WIN_DIR)\nmakehlp.out

+	@echo Cleaning $(WIN_DIR)\nmhlp-out.txt ...

+	@if exist $(WIN_DIR)\nmhlp-out.txt del $(WIN_DIR)\nmhlp-out.txt

+	@echo Cleaning $(WIN_DIR)\_junk.pch ...

+	@if exist $(WIN_DIR)\_junk.pch del $(WIN_DIR)\_junk.pch

+	@echo Cleaning $(WIN_DIR)\vercl.x, vercl.i ...

+	@if exist $(WIN_DIR)\vercl.x del $(WIN_DIR)\vercl.x

+	@if exist $(WIN_DIR)\vercl.i del $(WIN_DIR)\vercl.i

+	@echo Cleaning $(WIN_DIR)\versions.vc, version.vc ...

+	@if exist $(WIN_DIR)\versions.vc del $(WIN_DIR)\versions.vc

+	@if exist $(WIN_DIR)\version.vc del $(WIN_DIR)\version.vc

 

 default-hose: default-clean

 	@echo Hosing $(OUT_DIR)\* ...

@@ -1667,7 +1667,7 @@ DISABLE_IMPLICIT_RULES = 0
 $<

 <<

 

-{$(WINDIR)}.c{$(TMP_DIR)}.obj::

+{$(WIN_DIR)}.c{$(TMP_DIR)}.obj::

 	$(CCPKGCMD) @<<

 $<

 <<

@@ -1685,7 +1685,7 @@ $<
 {$(RCDIR)}.rc{$(TMP_DIR)}.res:

 	$(RESCMD) $<

 

-{$(WINDIR)}.rc{$(TMP_DIR)}.res:

+{$(WIN_DIR)}.rc{$(TMP_DIR)}.res:

 	$(RESCMD) $<

 

 {$(TMP_DIR)}.rc{$(TMP_DIR)}.res: