Split Tcl make targets into separate ones.

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 3b0a5e6f881df77e9a612d081bcc5bf19be45d03..592c5853a78355be02f0f7a6113ddf82124eef51 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,14 +4,18 @@
 call "Tools\buildbot\external-common.bat"\r
 call "%VS90COMNTOOLS%\vsvars32.bat"\r
 \r
-if not exist tcltk\bin\tcl85g.dll (\r
+if not exist tcltk\bin\tcl85.dll (\r
+    @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install\r
     cd tcl-8.5.2.1\win\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all install\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all \r
+    nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install\r
     cd ..\..\r
 )\r
 \r
-if not exist tcltk\bin\tk85g.dll (\r
+if not exist tcltk\bin\tk85.dll (\r
     cd tk-8.5.2.0\win    \r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean all install\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install\r
     cd ..\..\r
 )\r