diff options
| author | das <das@noemail.net> | 2004-01-27 10:10:05 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2004-01-27 10:10:05 (GMT) |
| commit | 7ffb9b8fec4f8cbae2b7ad690643fe29a0e5f0ab (patch) | |
| tree | 3f833f1f6cc664ae84c336a7fdcf47683e5d1c8c /macosx/Makefile | |
| parent | 0a595dc6ee582aad68b3628a1fc1d00453ec6ef5 (diff) | |
| download | tk-7ffb9b8fec4f8cbae2b7ad690643fe29a0e5f0ab.zip tk-7ffb9b8fec4f8cbae2b7ad690643fe29a0e5f0ab.tar.gz tk-7ffb9b8fec4f8cbae2b7ad690643fe29a0e5f0ab.tar.bz2 | |
* macosx/Wish.pbproj/project.pbxproj: removed erroneous reference
to mkpsenc.tcl in bundle resources phase (mkpsenc.tcl is already
part of the copy files phase to Resources/Scripts).
* macosx/Makefile: added support for 'xcodebuild' on Mac OS X 10.3.
FossilOrigin-Name: e7d3018b674e0d50545a10c40fc644552296edc5
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 9aa832f..d0a2f90 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Makefile to build AquaTk on Mac OS X packaged as a Framework # uses Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.7.2.4 2003/10/01 14:35:39 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7.2.5 2004/01/27 10:10:16 das Exp $ # ################################################################################ @@ -37,12 +37,17 @@ DEVBUILDSTYLE = Development DEPBUILDSTYLE = Deployment PBXBUILD = /usr/bin/pbxbuild +XCODEBUILD = /usr/bin/xcodebuild + +BUILDCMD = `if [ -f $(XCODEBUILD) ]; then \ + echo "$(XCODEBUILD)"; \ + else echo "$(PBXBUILD)"; fi` MAKE_VARS := SYMROOT OBJROOT BINDIR APPLICATION_INSTALL_PATH \ TCL_FRAMEWORK_DIR TCLSH_DIR MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v}) -BUILD = ${PBXBUILD} -target "${TARGET}" ${MAKE_ARGS_V} \ +BUILD = ${BUILDCMD} -target "${TARGET}" ${MAKE_ARGS_V} \ DYLIB_INSTALL_PATH="${INSTALL_PATH}" \ ${EXTRA_MAKE_ARGS} ${MAKEOVERRIDES} |