summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2023-05-19 12:02:49 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2023-05-19 12:02:49 (GMT)
commitb0f19e41f2c3e29950af3fb586b0f7a7f9112b2c (patch)
treeb744be174ece6b694da314852f5e1143ba086c48 /unix
parentfea912c676a71b362b8c7d77e3f4242e374de1bb (diff)
parente47cbdc798e9744e9a89840e9ace30186872a762 (diff)
downloadtcl-b0f19e41f2c3e29950af3fb586b0f7a7f9112b2c.zip
tcl-b0f19e41f2c3e29950af3fb586b0f7a7f9112b2c.tar.gz
tcl-b0f19e41f2c3e29950af3fb586b0f7a7f9112b2c.tar.bz2
merge core-8-branch
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in5
-rw-r--r--unix/dltest/pkgooa.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e092a2d..802472b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2293,9 +2293,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
cp -p $(GENERIC_DIR)/tclGetDate.y $(DISTDIR)/generic
- cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog $(TOP_DIR)/README.md \
- $(TOP_DIR)/ChangeLog.[12]??? $(TOP_DIR)/license.terms \
- $(DISTDIR)
+ cp -p $(TOP_DIR)/changes $(TOP_DIR)/README.md \
+ $(TOP_DIR)/license.terms $(DISTDIR)
@mkdir $(DISTDIR)/library
cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
$(TOP_DIR)/library/manifest.txt \
diff --git a/unix/dltest/pkgooa.c b/unix/dltest/pkgooa.c
index 444bb81..e75a2c3 100644
--- a/unix/dltest/pkgooa.c
+++ b/unix/dltest/pkgooa.c
@@ -125,18 +125,18 @@ Pkgooa_Init(
}
if (tclStubsPtr == NULL) {
Tcl_AppendResult(interp, "Tcl stubs are not initialized, "
- "did you compile using -DUSE_TCL_STUBS? ");
+ "did you compile using -DUSE_TCL_STUBS? ", NULL);
return TCL_ERROR;
}
if (Tcl_OOInitStubs(interp) == NULL) {
return TCL_ERROR;
}
if (tclOOStubsPtr == NULL) {
- Tcl_AppendResult(interp, "TclOO stubs are not initialized");
+ Tcl_AppendResult(interp, "TclOO stubs are not initialized", NULL);
return TCL_ERROR;
}
if (tclOOIntStubsPtr == NULL) {
- Tcl_AppendResult(interp, "TclOO internal stubs are not initialized");
+ Tcl_AppendResult(interp, "TclOO internal stubs are not initialized", NULL);
return TCL_ERROR;
}