diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-10 15:22:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-10 15:22:40 (GMT) |
| commit | a763531949a19917188ec4a929eead7efed7663a (patch) | |
| tree | ddc2a6b488420afda99407ee55230fd1b13a3e9c /win/makefile.vc | |
| parent | 54adbbe05cd04c6fb6d82bb36d4f9f36a5cb7ad5 (diff) | |
| parent | b22489dc5a3e775bef850cc02e0a8333048678b7 (diff) | |
| download | tcl-a763531949a19917188ec4a929eead7efed7663a.zip tcl-a763531949a19917188ec4a929eead7efed7663a.tar.gz tcl-a763531949a19917188ec4a929eead7efed7663a.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index e53d622..cb556d1 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -903,12 +903,12 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata $(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
@if not exist "$(SCRIPT_INSTALL_DIR)\cookiejar0.2$(NULL)" \
$(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.2"
- @if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9$(NULL)" \
- $(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl9"
- @if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0$(NULL)" \
- $(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0"
- @if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\platform$(NULL)" \
- $(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\platform"
+ @if not exist "$(MODULE_INSTALL_DIR)$(NULL)" \
+ $(MKDIR) "$(MODULE_INSTALL_DIR)"
+ @if not exist "$(MODULE_INSTALL_DIR)\9.0$(NULL)" \
+ $(MKDIR) "$(MODULE_INSTALL_DIR)\9.0"
+ @if not exist "$(MODULE_INSTALL_DIR)\9.0\platform$(NULL)" \
+ $(MKDIR) "$(MODULE_INSTALL_DIR)\9.0\platform"
@echo Installing header files
@$(CPY) "$(GENERICDIR)\tcl.h" "$(INCLUDE_INSTALL_DIR)\"
@$(CPY) "$(GENERICDIR)\tclDecls.h" "$(INCLUDE_INSTALL_DIR)\"
@@ -945,19 +945,19 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata "$(SCRIPT_INSTALL_DIR)\opt0.4\"
@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
@$(COPY) "$(ROOT)\library\http\http.tcl" \
- "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\http-$(PKG_HTTP_VER).tm"
+ "$(MODULE_INSTALL_DIR)\9.0\http-$(PKG_HTTP_VER).tm"
@echo Installing package msgcat $(PKG_MSGCAT_VER) as a Tcl Module
@$(COPY) "$(ROOT)\library\msgcat\msgcat.tcl" \
- "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\msgcat-$(PKG_MSGCAT_VER).tm"
+ "$(MODULE_INSTALL_DIR)\9.0\msgcat-$(PKG_MSGCAT_VER).tm"
@echo Installing package tcltest $(PKG_TCLTEST_VER) as a Tcl Module
@$(COPY) "$(ROOT)\library\tcltest\tcltest.tcl" \
- "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\tcltest-$(PKG_TCLTEST_VER).tm"
+ "$(MODULE_INSTALL_DIR)\9.0\tcltest-$(PKG_TCLTEST_VER).tm"
@echo Installing package platform $(PKG_PLATFORM_VER) as a Tcl Module
@$(COPY) "$(ROOT)\library\platform\platform.tcl" \
- "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\platform-$(PKG_PLATFORM_VER).tm"
+ "$(MODULE_INSTALL_DIR)\9.0\platform-$(PKG_PLATFORM_VER).tm"
@echo Installing package platform::shell $(PKG_SHELL_VER) as a Tcl Module
@$(COPY) "$(ROOT)\library\platform\shell.tcl" \
- "$(SCRIPT_INSTALL_DIR)\..\tcl9\9.0\platform\shell-$(PKG_SHELL_VER).tm"
+ "$(MODULE_INSTALL_DIR)\9.0\platform\shell-$(PKG_SHELL_VER).tm"
@echo Installing $(TCLDDELIBNAME)
!if $(STATIC_BUILD)
!if !$(TCL_USE_STATIC_PACKAGES)
|