summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-10 08:54:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-06-10 08:54:03 (GMT)
commite631538fd3fb692ada302817ab8b30632f2c107e (patch)
tree84b30f28bd535743bef1c979732c1c0de382e2aa
parent01cbe819b49cace3c1b7a401118ab746ff6d9e1d (diff)
parentf271e62139957e6137efb528670436c4a9393818 (diff)
downloadtcl-e631538fd3fb692ada302817ab8b30632f2c107e.zip
tcl-e631538fd3fb692ada302817ab8b30632f2c107e.tar.gz
tcl-e631538fd3fb692ada302817ab8b30632f2c107e.tar.bz2
Merge 8.7
-rw-r--r--unix/Makefile.in2
-rw-r--r--win/tcl.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index a4b4f6e..8661a98 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2278,7 +2278,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
$(INSTALL_DATA_DIR) $(DISTDIR)/library/$$i;\
$(DIST_INSTALL_DATA) $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
done
- $(DIST_INSTALL_DATA) $(TOP_DIR)/library/cookiejar/*.txt.gz $(DISTDIR)/library/cookiejar
+ $(DIST_INSTALL_DATA) $(TOP_DIR)/library/cookiejar/*.dat.gz $(DISTDIR)/library/cookiejar
$(INSTALL_DATA_DIR) $(DISTDIR)/library/encoding
$(DIST_INSTALL_DATA) $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding
$(INSTALL_DATA_DIR) $(DISTDIR)/library/msgs
diff --git a/win/tcl.m4 b/win/tcl.m4
index 82a2f29..1cfeecb 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1067,7 +1067,7 @@ AC_DEFUN([SC_PROG_TCLSH], [
AC_DEFUN([SC_BUILD_TCLSH], [
AC_MSG_CHECKING([for tclsh in Tcl build directory])
- BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}
+ BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}\${EXESUFFIX}
AC_MSG_RESULT($BUILD_TCLSH)
AC_SUBST(BUILD_TCLSH)
])