diff options
| author | das <das@noemail.net> | 2003-02-19 16:44:14 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2003-02-19 16:44:14 (GMT) |
| commit | e47f95274032cbd030029f640e57d649d946dcf0 (patch) | |
| tree | f7c6f352dc1d3004aee6ef5f7377bd27a473820c /macosx/Makefile | |
| parent | 3811c62bc5cdc878417dfc61b62d1c5fffb25436 (diff) | |
| download | tk-e47f95274032cbd030029f640e57d649d946dcf0.zip tk-e47f95274032cbd030029f640e57d649d946dcf0.tar.gz tk-e47f95274032cbd030029f640e57d649d946dcf0.tar.bz2 | |
* macosx/Wish.pbproj/project.pbxproj:
* macosx/Makefile: reworked embedded build to no longer require
relinking but to use install_name_tool instead to change the
install_names for embedded frameworks.
FossilOrigin-Name: adc63fd89bf7195ea048faa3e10d4c6238f32814
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 8a3c4e5..c05c4de 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.6 2002/10/16 23:56:02 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7 2003/02/19 16:44:16 das Exp $ # ################################################################################ @@ -25,7 +25,7 @@ DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" INSTALLOPTS = INSTALL_ROOT="${INSTALL_ROOT}" -EMBEDDEDOPTS = DYLIB_INSTALL_PATH="@executable_path/../Frameworks" +EMBEDDEDOPTS = EMBEDDED_BUILD=1 ################################################################################ @@ -35,7 +35,7 @@ install: install-develop install-deploy embedded: embedded-deploy -install-embedded: install-embedded-deploy cleanup-embedded forceRelink forceRelinkTcl +install-embedded: install-embedded-deploy cleanup-embedded clean: clean-develop clean-deploy @@ -53,10 +53,10 @@ install-develop: install-deploy: ${DEPBUILD} install ${INSTALLOPTS} -embedded-develop: forceRelink +embedded-develop: ${DEVBUILD} ${EMBEDDEDOPTS} -embedded-deploy: forceRelink +embedded-deploy: ${DEPBUILD} ${EMBEDDEDOPTS} install-embedded-develop: @@ -77,15 +77,8 @@ forceRelink: @-cd ${BUILD_DIR}; \ rm -rf Tk.framework Wish\ Shell.app libtkstub8.4.a -forceRelinkTcl: - @-cd ${BUILD_DIR}; \ - rm -rf Tcl.framework \ - Development.build/Tcl.build/Tcl Deployment.build/Tcl.build/Tcl - cleanup-embedded: @-cd ${INSTALL_ROOT}; \ - rm -f Frameworks; \ - rm -rf @executable_path; \ chmod -RH u+w Library/Frameworks/Tcl.framework; \ rm -rf Library/Frameworks/Tcl.framework; \ chmod -RH u+w Library/Frameworks/Tk.framework; \ |