summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-12-31 18:22:04 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-12-31 18:22:04 (GMT)
commit337a6648fee48d63d97c16579b72703b39647564 (patch)
tree578481a679d1e87f7bc749a7353ffe04d0613759
parenta7b4a7560837d1f6f303dc6ee53db1a2c849aebb (diff)
downloadtcl-337a6648fee48d63d97c16579b72703b39647564.zip
tcl-337a6648fee48d63d97c16579b72703b39647564.tar.gz
tcl-337a6648fee48d63d97c16579b72703b39647564.tar.bz2
* unix/Makefile.in: Set TCLLIBPATH in SHELL_ENV so that targets
like `make shell` have access to builds of bundled packages.
-rw-r--r--ChangeLog5
-rw-r--r--unix/Makefile.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9ceae7..fe39617 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-31 Don Porter <dgp@users.sourceforge.net>
+
+ * unix/Makefile.in: Set TCLLIBPATH in SHELL_ENV so that targets
+ like `make shell` have access to builds of bundled packages.
+
2008-12-28 Donal K. Fellows <dkf@users.sf.net>
* generic/tclZlib.c (Tcl_ZlibStreamPut): Plug a memory leak.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 799ee0e..070b472 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.258 2008/12/22 15:45:43 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.259 2008/12/31 18:22:04 dgp Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -617,6 +617,7 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
# This keeps tcltest from picking up an already installed version of the Tcl
# library.
SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \
+ TCLLIBPATH="@abs_builddir@/pkgs" \
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"
tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}