Attachment "macosx_modulepath.diff" to
ticket [942881ffff]
added by
das
2004-08-26 22:54:04.
Index: macosx/Makefile
===================================================================
RCS file: /cvsroot/tcl/tcl/macosx/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- macosx/Makefile 20 Jul 2004 10:23:14 -0000 1.15
+++ macosx/Makefile 26 Aug 2004 15:38:34 -0000
@@ -31,6 +31,7 @@ INSTALL_MANPAGES ?=
TCL_PACKAGE_PATH ?= "~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl \
~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks \
/System/Library/Frameworks"
+TCL_MODULE_PATH ?= "~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
#-------------------------------------------------------------------------------------------------------
# meta targets
@@ -114,7 +115,7 @@ OBJ_DIR = ${OBJROOT}/${BUILD_STYLE}
${PROJECT}: override INSTALL_ROOT = ${OBJ_DIR}/
-MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH TCL_LIBRARY DYLIB_INSTALL_DIR
+MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH TCL_MODULE_PATH TCL_LIBRARY DYLIB_INSTALL_DIR
MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v})
export CPPROG := cp -p
Index: unix/Makefile.in
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/Makefile.in,v
retrieving revision 1.143
diff -u -p -r1.143 Makefile.in
--- unix/Makefile.in 18 Aug 2004 19:59:09 -0000 1.143
+++ unix/Makefile.in 26 Aug 2004 15:38:34 -0000
@@ -78,6 +78,9 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma
# Package search path.
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+# Tcl Module default path roots (TIP189).
+TCL_MODULE_PATH =
+
# Libraries built with optimization switches have this additional extension
TCL_DBGX = @TCL_DBGX@
@@ -691,6 +694,11 @@ install-libraries: libraries install-tzd
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/encoding; \
done;
+ @if [ -n "$(TCL_MODULE_PATH)" -a -e $(TOP_DIR)/library/tm.tcl ]; then \
+ echo "Customizing tcl module path"; \
+ echo "::tcl::tm::roots {$(TCL_MODULE_PATH)}" >> \
+ $(SCRIPT_INSTALL_DIR)/tm.tcl; \
+ fi
install-tzdata:
@echo "Installing time zone data"
