summaryrefslogtreecommitdiffstats
path: root/macosx/Makefile
diff options
context:
space:
mode:
authordas <das>2004-11-19 06:29:23 (GMT)
committerdas <das>2004-11-19 06:29:23 (GMT)
commit6297311b712fb631b245f682cfcbc17a233d7b60 (patch)
treea308ab4415be70ba2d96ac4b00d0aef89dbd9fdb /macosx/Makefile
parent318ca631dc34f11954febc6e0681081c82365e46 (diff)
downloadtcl-6297311b712fb631b245f682cfcbc17a233d7b60.zip
tcl-6297311b712fb631b245f682cfcbc17a233d7b60.tar.gz
tcl-6297311b712fb631b245f682cfcbc17a233d7b60.tar.bz2
* macosx/Makefile:
* unix/configure.in: * unix/tclUnixInit.c (MacOSXGetLibraryPath): changed detection of tcl framework build when determining tclLibPath from overloaded TCL_LIBRARY to configuration define TCL_FRAMEWORK. [Bug 1068088] * unix/configure: autoconf-2.13 * tests/unixInit.test (7.1): fixed failure when running tests with -tmpdir arg not set to working dir.
Diffstat (limited to 'macosx/Makefile')
-rw-r--r--macosx/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/macosx/Makefile b/macosx/Makefile
index ee9e40c..6458cb1 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.5.2.9 2004/11/11 01:17:07 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.5.2.10 2004/11/19 06:29:23 das Exp $
#
########################################################################################################
@@ -101,7 +101,6 @@ TCL_EXE ?= ${SYMROOT}/${TCLSH}
DYLIB_INSTALL_PATH ?= ${INSTALL_PATH}
-TCL_LIBRARY := @TCL_IN_FRAMEWORK@
LIBDIR := ${INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${PRODUCT_VERSION}
DYLIB_INSTALL_DIR := ${DYLIB_INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${PRODUCT_VERSION}
INCLUDEDIR := ${LIBDIR}/Headers
@@ -115,7 +114,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 DYLIB_INSTALL_DIR
MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v})
export CPPROG := cp -p