summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorapnadkarni <apnmbx-wits@yahoo.com>2017-11-07 14:02:39 (GMT)
committerapnadkarni <apnmbx-wits@yahoo.com>2017-11-07 14:02:39 (GMT)
commit14e12f7e19a8139df7ad533b092914e268693337 (patch)
treed86a11fab1e061fc1baeb34e130f8c6416b694f2 /win
parent9ef649d2001840791cbd75e926520885d0f43f5d (diff)
downloadtk-14e12f7e19a8139df7ad533b092914e268693337.zip
tk-14e12f7e19a8139df7ad533b092914e268693337.tar.gz
tk-14e12f7e19a8139df7ad533b092914e268693337.tar.bz2
Update to latest Tcl vc-reform
Diffstat (limited to 'win')
-rw-r--r--win/rules.vc7
1 files changed, 3 insertions, 4 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 5e98d77..1289aec 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -117,7 +117,6 @@ Visual C++ compiler environment not initialized.
#----------------------------------------------------------
RMDIR = rmdir /S /Q
-ERRNULL = 2>NUL
CPY = xcopy /i /y >NUL
CPYDIR = xcopy /e /i /y >NUL
COPY = copy /y >NUL
@@ -388,7 +387,7 @@ VCVER=0
&& ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
&& ![echo ARCH=AMD64 >> vercl.x] \
&& ![echo $(_HASH)endif >> vercl.x] \
- && ![$(cc32) -nologo -TC -P vercl.x $(ERRNULL)]
+ && ![$(cc32) -nologo -TC -P vercl.x 2>NUL]
!include vercl.i
!if $(VCVERSION) < 1900
!if ![echo VCVER= ^\> vercl.vc] \
@@ -402,7 +401,7 @@ VCVER = $(VCVERSION)
!endif
!endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
+!if ![del 2>NUL /q/f vercl.x vercl.i vercl.vc]
!endif
#----------------------------------------------------------------
@@ -829,7 +828,7 @@ WARNINGS = $(WARNINGS) -Wp64
################################################################
# 9. Extract various version numbers
-# For Tcl and Tk, version numbers are exctracted from tcl.h and tk.h
+# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h
# respectively. For extensions, versions are extracted from the
# configure.in or configure.ac from the TEA configuration if it
# exists, and unset otherwise.