summaryrefslogtreecommitdiffstats
path: root/macosx/Makefile
diff options
context:
space:
mode:
authordas <das>2003-03-18 13:55:48 (GMT)
committerdas <das>2003-03-18 13:55:48 (GMT)
commit78f88f52a525c493e79fc724760e36eb76a21d43 (patch)
tree67f39032103b5f694762137294aa30ab944c7cd6 /macosx/Makefile
parent98b37d9985ff3f2d38100fd2a86bc33627f278d9 (diff)
downloadtk-78f88f52a525c493e79fc724760e36eb76a21d43.zip
tk-78f88f52a525c493e79fc724760e36eb76a21d43.tar.gz
tk-78f88f52a525c493e79fc724760e36eb76a21d43.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/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/macosx/Makefile b/macosx/Makefile
index c05c4de..3945438 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.7.2.1 2003/03/18 13:55:50 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
################################################################################