summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-09-16 17:49:41 (GMT)
committerhobbs <hobbs>2010-09-16 17:49:41 (GMT)
commit66dbe859f32e92636a348c8e61eac80606c30d1e (patch)
treea66cfc850902cd4aae0ec18387a9a98f263e6c8e /unix/Makefile.in
parent5817de92b6e25bf3e19ff91d3fd006717526a6c7 (diff)
downloadtcl-66dbe859f32e92636a348c8e61eac80606c30d1e.zip
tcl-66dbe859f32e92636a348c8e61eac80606c30d1e.tar.gz
tcl-66dbe859f32e92636a348c8e61eac80606c30d1e.tar.bz2
* unix/Makefile.in: do not pass current build env vars when using
NATIVE_TCLSH in targets.
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in16
1 files changed, 6 insertions, 10 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 37d8f45..4006bf0 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.305 2010/09/15 16:55:14 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.306 2010/09/16 17:49:41 hobbs Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -164,6 +164,7 @@ INSTALL_DATA = ${INSTALL} -m 644
# running make for the first time. Certain build targets (make genstubs) need
# it to be available on the PATH. This executable should *NOT* be required
# just to do a normal build although it can be required to run make dist.
+# Do not use SHELL_ENV for NATIVE_TCLSH unless it is the tclsh being built.
EXE_SUFFIX = @EXEEXT@
TCL_EXE = tclsh${EXE_SUFFIX}
TCLTEST_EXE = tcltest${EXE_SUFFIX}
@@ -867,16 +868,12 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
install-tzdata: ${NATIVE_TCLSH}
@echo "Installing time zone data"
- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
- ${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \
+ @${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \
$(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
install-msgs: ${NATIVE_TCLSH}
@echo "Installing message catalogs"
- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
- ${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \
+ @${NATIVE_TCLSH} $(TOOL_DIR)/installData.tcl \
$(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
install-doc: doc
@@ -2040,9 +2037,8 @@ html-tk: ${NATIVE_TCLSH}
@EXTRA_BUILD_HTML@
BUILD_HTML = \
- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
- ${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \
+ @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
+ --htmldir="$(HTML_INSTALL_DIR)" \
--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
#--------------------------------------------------------------------------