diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-06-10 17:03:34 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-06-10 17:03:34 (GMT) |
| commit | 7f0c322429df0ae6a0558b788894c671ad23b834 (patch) | |
| tree | db259e52783b8a629c4213886c8d9612801a20ea /win | |
| parent | 9e305d6d450550ac4dfa3163ac8f7deb48fc26ae (diff) | |
| parent | f0b110ee6ec2b5679e89039a0014f853acc8c359 (diff) | |
| download | tk-7f0c322429df0ae6a0558b788894c671ad23b834.zip tk-7f0c322429df0ae6a0558b788894c671ad23b834.tar.gz tk-7f0c322429df0ae6a0558b788894c671ad23b834.tar.bz2 | |
merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index e53e8cb..377fba4 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -126,6 +126,7 @@ TCL_SRC_DIR_NATIVE = $(shell $(CYGPATH) '$(TCL_SRC_DIR)') DLLSUFFIX = @DLLSUFFIX@ LIBSUFFIX = @LIBSUFFIX@ EXESUFFIX = @EXESUFFIX@ +TCLVER = @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@ VER = @TK_MAJOR_VERSION@@TK_MINOR_VERSION@ DOTVER = @TK_MAJOR_VERSION@.@TK_MINOR_VERSION@ @@ -203,8 +204,6 @@ RM = rm -f COPY = cp LN = ln -BUILD_TCLSH = @BUILD_TCLSH@ - # Tk does not used deprecated Tcl constructs so it should # compile fine with -DTCL_NO_DEPRECATED. To remove its own # set of deprecated code uncomment the second line. @@ -708,7 +707,7 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ) @$(RMDIR) $(TK_VFS_PATH)/demos -@if test "${ZIPFS_BUILD}" = "2" ; then \ - cp ${BUILD_TCLSH} ${TK_VFS_ROOT}/../${TK_ZIP_FILE} ; \ + cp ${TCL_BIN_DIR}/tclsh${TCLVER}s.exe ${TK_VFS_ROOT}/../${TK_ZIP_FILE} || cp ${TCL_BIN_DIR}/../bin/tclsh${TCLVER}s.exe ${TK_VFS_ROOT}/../${TK_ZIP_FILE}; \ (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ cd ${TK_VFS_ROOT} && $$zip -J ../${TK_ZIP_FILE}) \ |