diff options
| author | das <das> | 2004-11-19 06:28:29 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-19 06:28:29 (GMT) |
| commit | 05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4 (patch) | |
| tree | 8a7b9fc7d04eb0be39469179cd1297ff8414d356 /macosx/Makefile | |
| parent | 1da4df965b312f16caac077583bbe48e890b2756 (diff) | |
| download | tcl-05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4.zip tcl-05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4.tar.gz tcl-05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4.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.57
* unix/tclConfig.h.in: autoheader-2.57
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 f3de349..bc469d8 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.17 2004/11/11 01:16:41 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.18 2004/11/19 06:28:29 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_MODULE_PATH TCL_LIBRARY DYLIB_INSTALL_DIR +MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH TCL_MODULE_PATH DYLIB_INSTALL_DIR MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v}) export CPPROG := cp -p |