From bb0486b2b82906125cbe7ef326bb4a2766beb96e Mon Sep 17 00:00:00 2001 From: andreas_kupries Date: Thu, 26 Jun 2008 22:12:50 +0000 Subject: * unix/Makefile.in: Followup to my change of 2008-06-25, make code generated by the Makefile and put into the installed tm.tcl conditional on interpreter safeness as well. Thanks to Daniel Steffen for reminding me of that code. --- ChangeLog | 7 +++++++ unix/Makefile.in | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1396c8..2da833f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-26 Andreas Kupries + + * unix/Makefile.in: Followup to my change of 2008-06-25, make code + generated by the Makefile and put into the installed tm.tcl + conditional on interpreter safeness as well. Thanks to Daniel + Steffen for reminding me of that code. + 2008-06-25 Don Porter *** 8.6a1 TAGGED FOR RELEASE *** diff --git a/unix/Makefile.in b/unix/Makefile.in index 7657c1b..b351ebe 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.239 2008/06/12 20:08:58 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.240 2008/06/26 22:12:51 andreas_kupries Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -822,7 +822,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs done; @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \ echo "Customizing tcl module path"; \ - echo "::tcl::tm::roots {$(TCL_MODULE_PATH)}" >> \ + echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ fi -- cgit v0.12