summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-23 13:28:32 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-23 13:28:32 (GMT)
commit2057f61af78500da2956bf3aa83cc10878e93d09 (patch)
treee7364b4bb34b0a57c4cb321fb2f9f8ddc8223554 /win
parentc5c29cc39d29340d28c498b3008ba0a9ca9f84bd (diff)
parentc952daff893fa20dc2773d7cf5aeaa4687ba6f45 (diff)
downloadtk-2057f61af78500da2956bf3aa83cc10878e93d09.zip
tk-2057f61af78500da2956bf3aa83cc10878e93d09.tar.gz
tk-2057f61af78500da2956bf3aa83cc10878e93d09.tar.bz2
sync nmakehlp.c with Tcl version
<p>purge spaces at end of lines <p>clean-up unix/Makefile.in after carbon removal
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in6
-rw-r--r--win/nmakehlp.c9
2 files changed, 8 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 0f8f545..eda2aed 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -145,7 +145,7 @@ MAN2TCL = man2tcl$(EXEEXT)
@SET_MAKE@
-# Setting the VPATH variable to a list of paths will cause the
+# Setting the VPATH variable to a list of paths will cause the
# makefile to look into these paths when resolving .c to .obj
# dependencies.
@@ -406,7 +406,7 @@ SHELL_ENV = \
TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH;
-# Main targets. The default target -- all -- builds the binaries,
+# Main targets. The default target -- all -- builds the binaries,
# performs any post processing on libraries or documents.
all: binaries libraries doc
@@ -481,7 +481,7 @@ install-binaries: binaries
$(COPY) $$i "$(BIN_INSTALL_DIR)"; \
fi; \
done
- @echo "Creating package index $(PKG_INDEX)";
+ @echo "Creating package index $(PKG_INDEX)";
@$(RM) $(PKG_INDEX);
@(\
echo "if {[catch {package present Tcl $(TCLVERSION).0}]} return";\
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index d0edcf0..b1a1517 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -498,9 +498,10 @@ GetVersionFromFile(
p = strstr(szBuffer, match);
if (p != NULL) {
/*
- * Skip to first digit.
+ * Skip to first digit after the match.
*/
+ p += strlen(match);
while (*p && !isdigit(*p)) {
++p;
}
@@ -630,11 +631,11 @@ SubstituteFile(
}
}
#endif
-
+
/*
* Run the substitutions over each line of the input
*/
-
+
while (fgets(szBuffer, cbBuffer, fp) != NULL) {
list_item_t *p = NULL;
for (p = substPtr; p != NULL; p = p->nextPtr) {
@@ -654,7 +655,7 @@ SubstituteFile(
}
printf(szBuffer);
}
-
+
list_free(&substPtr);
}
fclose(fp);