diff options
| author | das <das> | 2003-03-18 13:47:51 (GMT) |
|---|---|---|
| committer | das <das> | 2003-03-18 13:47:51 (GMT) |
| commit | 6d2e686af813fdc90ed20c73f1326d12c1ffe6c1 (patch) | |
| tree | 6cc80dc64de0ee1159949f14575b233bf5761f6c /macosx/Makefile | |
| parent | eca44d19d52e388aa19ca757cf2d64ee8c9db3e4 (diff) | |
| download | tk-6d2e686af813fdc90ed20c73f1326d12c1ffe6c1.zip tk-6d2e686af813fdc90ed20c73f1326d12c1ffe6c1.tar.gz tk-6d2e686af813fdc90ed20c73f1326d12c1ffe6c1.tar.bz2 | |
* macosx/Wish.pbproj/project.pbxproj:
* macosx/Makefile:
* macosx/README: added support for giving 'make' the location
of Tcl.framework and tclsh to build and link against.
* macosx/tkMacOSXXStubs.c: fixed crash in [winfo server].
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index c05c4de..c6e2d4d 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.7 2003/02/19 16:44:16 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.8 2003/03/18 13:47:52 das Exp $ # ################################################################################ @@ -11,6 +11,9 @@ INSTALL_ROOT ?= BUILD_DIR ?= ${CURDIR}/../../build +TCL_FRAMEWORK_DIR ?= ${BUILD_DIR} +TCLSH_DIR ?= ${TCL_FRAMEWORK_DIR} + TARGET = Wish DEVBUILDSTYLE = Development @@ -18,7 +21,8 @@ DEPBUILDSTYLE = Deployment PBXBUILD = /usr/bin/pbxbuild -BUILD = ${PBXBUILD} SYMROOT="${BUILD_DIR}" -target "${TARGET}" +BUILD = ${PBXBUILD} SYMROOT="${BUILD_DIR}" -target "${TARGET}" \ + TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" TCLSH_DIR="${TCLSH_DIR}" DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" @@ -89,7 +93,7 @@ cleanup-embedded: .PHONY: all install embedded clean develop deploy install-develop install-deploy \ embedded-develop embedded-deploy install-embedded-develop install-embedded-deploy \ -clean-develop clean-deploy forceRelinkTcl \ +clean-develop clean-deploy forceRelink \ cleanup-embedded ################################################################################ |