summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-01 10:33:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-09-01 10:33:33 (GMT)
commitd99566171273e05f659f3f4f364b9d1948ec8565 (patch)
treec4a99a3ac584ca9f6609ca8575261cf7b3d419a0 /win
parentd52b3eef8055623bab469007083629a4e134955b (diff)
parent724de352e37dd0fe795024353378cd662593b4a6 (diff)
downloadtcl-d99566171273e05f659f3f4f364b9d1948ec8565.zip
tcl-d99566171273e05f659f3f4f364b9d1948ec8565.tar.gz
tcl-d99566171273e05f659f3f4f364b9d1948ec8565.tar.bz2
Merge 8.6
Diffstat (limited to 'win')
-rw-r--r--win/rules.vc6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/rules.vc b/win/rules.vc
index a4aeca1..61df910 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -514,7 +514,7 @@ CFG_ENCODING = \"cp1252\"
# information about supported compiler options etc.
#
# Tcl itself will always use the nmakehlp.c program which is
-# in its own source. This is the "master" copy and kept updated.
+# in its own source. It will be kept updated there.
#
# Extensions built against an installed Tcl will use the installed
# copy of Tcl's nmakehlp.c if there is one and their own version
@@ -1669,7 +1669,7 @@ default-shell: default-setup $(PROJECT)
!ifdef RCFILE
# Note: don't use $** in below rule because there may be other dependencies
-# and only the "master" rc must be passed to the resource compiler
+# and only the "main" rc must be passed to the resource compiler
$(TMP_DIR)\$(PROJECT).res: $(RCDIR)\$(PROJECT).rc
$(RESCMD) $(RCDIR)\$(PROJECT).rc
@@ -1723,7 +1723,7 @@ DISABLE_IMPLICIT_RULES = 0
!if !$(DISABLE_IMPLICIT_RULES)
# Implicit rule definitions - only for building library objects. For stubs and
-# main application, the master makefile should define explicit rules.
+# main application, the makefile should define explicit rules.
{$(ROOT)}.c{$(TMP_DIR)}.obj::
$(CCPKGCMD) @<<