diff options
| author | das <das@noemail.net> | 2004-11-19 06:29:23 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2004-11-19 06:29:23 (GMT) |
| commit | 85f3724b495ae0e535af6b8431071cb485f63140 (patch) | |
| tree | a308ab4415be70ba2d96ac4b00d0aef89dbd9fdb /macosx/Makefile | |
| parent | 2293fbfaf4c35ceff3d435991774a94939eadc70 (diff) | |
| download | tcl-85f3724b495ae0e535af6b8431071cb485f63140.zip tcl-85f3724b495ae0e535af6b8431071cb485f63140.tar.gz tcl-85f3724b495ae0e535af6b8431071cb485f63140.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.
FossilOrigin-Name: 7902f93e6c408abd3ba88e6cfdcf786e8aeb778a
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 5 |
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 |