summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--macosx/Makefile5
-rw-r--r--unix/Makefile.in10
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a6363f..33f3567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-27 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/Makefile.in: added customization of default module path roots
+ via TCL_MODULE_PATH makefile variable.
+ * macosx/Makefile: add platform standard locations to default
+ module path roots. [Patch 94288]
+
2004-08-25 Don Porter <dgp@users.sourceforge.net>
* tests/timer.test (timer-10.1): Test for Bug 1016167.
diff --git a/macosx/Makefile b/macosx/Makefile
index 472a0ad..4c5509f 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
# Makefile to build Tcl on Mac OS X packaged as a Framework
# uses standard unix build system in tcl/unix
#
-# RCS: @(#) $Id: Makefile,v 1.15 2004/07/20 10:23:14 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.16 2004/08/26 16:01:28 das Exp $
#
########################################################################################################
@@ -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
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6273cf7..99e58e7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.143 2004/08/18 19:59:09 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.144 2004/08/26 16:01:29 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -78,6 +78,9 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
# 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-tzdata install-msgs
@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"