diff options
| author | das <das> | 2003-10-01 14:35:32 (GMT) |
|---|---|---|
| committer | das <das> | 2003-10-01 14:35:32 (GMT) |
| commit | 48e0e43fbc61a0da6568824965c13e2ec7cb2e38 (patch) | |
| tree | 9282d9e20469dd360031a46c842bd3c05d990f72 /macosx/Makefile | |
| parent | 009ece320d1dad3ff4557d55b5859b4512d1660e (diff) | |
| download | tk-48e0e43fbc61a0da6568824965c13e2ec7cb2e38.zip tk-48e0e43fbc61a0da6568824965c13e2ec7cb2e38.tar.gz tk-48e0e43fbc61a0da6568824965c13e2ec7cb2e38.tar.bz2 | |
* macosx/Wish.pbproj/project.pbxproj:
* macosx/Makefile: fixed redo prebinding bug when DESTDIR="".
Added support for all applicable customizable makefile variables
from tcl/macosx/Makefile.
* macosx/README:
* macosx/Wish.pbproj/project.pbxproj: ensure that the versioned
wishX.X script works correctly when Tk.framework with multiple
versions is present by referring to a copy of 'Wish Shell.app'
located in Tk.framework/Versions/X.X/Resources.
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 59 |
1 files changed, 39 insertions, 20 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 5882520..82d50b5 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -1,38 +1,57 @@ ################################################################################ # -# Simple makefile for building on Mac OS X with the -# Project Builder command line tool 'pbxbuild' +# Makefile to build AquaTk on Mac OS X packaged as a Framework +# uses Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.10 2003/09/25 05:37:00 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.11 2003/10/01 14:35:32 das Exp $ # ################################################################################ -INSTALL_ROOT ?= +#------------------------------------------------------------------------------- +# customizable settings -BUILD_DIR ?= ${CURDIR}/../../build -SYMROOT ?= ${BUILD_DIR}/${PROJECT} +DESTDIR ?= +INSTALL_ROOT ?= ${DESTDIR} + +BUILD_DIR ?= ${CURDIR}/../../build +SYMROOT ?= ${BUILD_DIR}/${PROJECT} +OBJROOT ?= ${SYMROOT} + +EXTRA_MAKE_ARGS ?= + +INSTALL_PATH ?= /Library/Frameworks +APPLICATION_INSTALL_PATH ?= /Applications/Utilities + +PREFIX ?= /usr +BINDIR ?= ${PREFIX}/bin TCL_FRAMEWORK_DIR ?= ${BUILD_DIR}/tcl -TCLSH_DIR ?= ${TCL_FRAMEWORK_DIR} +TCLSH_DIR ?= ${TCL_FRAMEWORK_DIR} + +#------------------------------------------------------------------------------- + +PROJECT = tk +TARGET = Wish -PROJECT = tk -TARGET = Wish +DEVBUILDSTYLE = Development +DEPBUILDSTYLE = Deployment -DEVBUILDSTYLE = Development -DEPBUILDSTYLE = Deployment +PBXBUILD = /usr/bin/pbxbuild -PBXBUILD = /usr/bin/pbxbuild +MAKE_VARS := SYMROOT OBJROOT BINDIR APPLICATION_INSTALL_PATH \ + TCL_FRAMEWORK_DIR TCLSH_DIR +MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v}) -BUILD = ${PBXBUILD} SYMROOT="${SYMROOT}" -target "${TARGET}" \ - TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" \ - TCLSH_DIR="${TCLSH_DIR}" ${MAKEOVERRIDES} +BUILD = ${PBXBUILD} -target "${TARGET}" ${MAKE_ARGS_V} \ + DYLIB_INSTALL_PATH="${INSTALL_PATH}" \ + ${EXTRA_MAKE_ARGS} ${MAKEOVERRIDES} -DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" -DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" +DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" +DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" -INSTALLOPTS = INSTALL_ROOT="${INSTALL_ROOT}" +INSTALLOPTS = INSTALL_ROOT="${INSTALL_ROOT}" -EMBEDDEDOPTS = EMBEDDED_BUILD=1 +EMBEDDEDOPTS = EMBEDDED_BUILD=1 ################################################################################ @@ -81,7 +100,7 @@ clean-deploy: ################################################################################ cleanup-embedded: - @-cd ${INSTALL_ROOT}; \ + @-cd ${INSTALL_ROOT}/; \ chmod -RH u+w Library/Frameworks/Tcl.framework; \ rm -rf Library/Frameworks/Tcl.framework; \ chmod -RH u+w Library/Frameworks/Tk.framework; \ |