Index: win/makefile.vc
==================================================================
--- win/makefile.vc
+++ win/makefile.vc
@@ -67,23 +67,28 @@
 
 # Implicit rule to generate html from man files
 # NOTE: this requires doctools from tcllib hence it is not intended
 # to be run during install. Rather, use it to generate a new version
 # of HTML docs to be stored in the repository.
+TCLSH = "$(_INSTALLDIR)\..\bin\tclsh.exe"
+DTPLITE = "$(_INSTALLDIR)\..\bin\dtplite.tcl"
+
 make-docs-html:
-	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
-	    -o "$(ROOT)\doc\$(PROJECT).html" html "$(ROOT)\doc\$(PROJECT).man"
+!IF EXIST($(DTPLITE))
+	"$(TCLSH)" "$(DTPLITE)" -o "$(ROOT)\doc\$(PROJECT).html" html "$(ROOT)\doc\$(PROJECT).man"
+!ENDIF
 
 make-docs-n:
-	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
-	    -o "$(ROOT)\doc\$(PROJECT).n" nroff "$(ROOT)\doc\$(PROJECT).man"
+!IF EXIST($(DTPLITE))
+	"$(TCLSH)" "$(DTPLITE)" -o "$(ROOT)\doc\$(PROJECT).n" nroff "$(ROOT)\doc\$(PROJECT).man"
+!ENDIF
 
 make-docs:
-	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
-	    -o "$DOCDIR" html "$(ROOT)\doc"
-	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
-	    -o "$DOCDIR" nroff "$(ROOT)\doc"
+!IF EXIST($(DTPLITE))
+	"$(TCLSH)" "$(DTPLITE)" -o "$DOCDIR" html "$(ROOT)\doc"
+	"$(TCLSH)" "$(DTPLITE)" -o "$DOCDIR" nroff "$(ROOT)\doc"
+!ENDIF
 
 docs: make-docs-n make-docs-html 
 
 all: setup default-target
 
@@ -113,20 +118,20 @@
 	}
 <<
 
 # Use manifest file which defines fossil/git commit id for build-info command
 $(TMP_DIR)\manifest.uuid:
-!if exist($(ROOT)\manifest.uuid)
+!IF EXIST($(ROOT)\manifest.uuid)
 	@copy "$(ROOT)\manifest.uuid" "$(TMP_DIR)\manifest.uuid"
-!else
-!if exist($(ROOT)\.git)
+!ELSE
+!IF EXIST($(ROOT)\.git)
 	@copy "$(WIN_DIR)\gitmanifest.in" "$(TMP_DIR)\manifest.uuid"
 	@git rev-parse HEAD >>$(TMP_DIR)\manifest.uuid || echo unknown >>$(TMP_DIR)\manifest.uuid
-!else
+!ELSE
 	@echo unknown >$(TMP_DIR)\manifest.uuid
-!endif
-!endif
+!ENDIF
+!ENDIF
 
 $(TMP_DIR)\tlsUuid.h:	$(TMP_DIR)\manifest.uuid
 	@copy $(WIN_DIR)\tlsUuid.h.in+$(TMP_DIR)\manifest.uuid $(TMP_DIR)\tlsUuid.h
 	@echo: >>$(TMP_DIR)\tlsUuid.h
 
@@ -133,15 +138,15 @@
 # The default install target only installs binaries and scripts so add
 # an additional target for our documentation. Note this *adds* a target
 # since no commands are listed after it. The original targets for
 # install (from targets.vc) will remain.
 install: pkgindex default-install default-install-docs-html
-!if exist($(SSL_INSTALL_FOLDER)\bin\libcrypto-*-x64.dll)
+!IF EXIST($(SSL_INSTALL_FOLDER)\bin\libcrypto-*-x64.dll)
 	@xcopy /c /y "$(SSL_INSTALL_FOLDER)\bin\libcrypto-*-x64.dll" "$(PRJ_INSTALL_DIR)"
-!endif
-!if exist($(SSL_INSTALL_FOLDER)\bin\libssl-*-x64.dll)
+!ENDIF
+!IF EXIST($(SSL_INSTALL_FOLDER)\bin\libssl-*-x64.dll)
 	@xcopy /c /y "$(SSL_INSTALL_FOLDER)\bin\libssl-*-x64.dll" "$(PRJ_INSTALL_DIR)"
-!endif
+!ENDIF
 
 # Test package
 test: default-test