diff options
| author | das <das> | 2002-09-26 17:06:13 (GMT) |
|---|---|---|
| committer | das <das> | 2002-09-26 17:06:13 (GMT) |
| commit | c617b8641b937f02e006a2d6669dbd861d8aa8fc (patch) | |
| tree | e3513cb233b060342c249da813e49416b6e06c3d /macosx/Makefile | |
| parent | 726b5d2fc23e5f719b5453cd0d67e4a25b2efb2c (diff) | |
| download | tcl-c617b8641b937f02e006a2d6669dbd861d8aa8fc.zip tcl-c617b8641b937f02e006a2d6669dbd861d8aa8fc.tar.gz tcl-c617b8641b937f02e006a2d6669dbd861d8aa8fc.tar.bz2 | |
* macosx/Makefile: preserve environment value of INSTALL_ROOT.
When embedding only use deployment build. Force relink before
embedded build to ensure new linker flags are picked up.
* macosx/Tcl.pbproj/project.pbxproj: add symbolic links to
debug lib, stub libs and tclConfig.sh in framework toplevel.
Configure target dependency fix. Fix to 'clean' action. Added
private tcl headers to framework. Install tclsh symbolic link.
Html doc build works when no installed tclsh available. Made
html doc structure in framework more like in Apple frameworks.
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 529e2f5..27d22b1 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,13 +3,13 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.3 2002/09/10 09:57:44 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.4 2002/09/26 17:06:14 das Exp $ # ################################################################################ -INSTALL_ROOT = +INSTALL_ROOT ?= -BUILD_DIR = ../../build +BUILD_DIR ?= ${CURDIR}/../../build TARGET = Tcl @@ -33,9 +33,9 @@ all: develop deploy install: install-develop install-deploy -embedded: embedded-develop embedded-deploy +embedded: embedded-deploy -install-embedded: install-embedded-develop install-embedded-deploy +install-embedded: install-embedded-deploy clean: clean-develop clean-deploy @@ -53,10 +53,10 @@ install-develop: install-deploy: ${DEPBUILD} install ${INSTALLOPTS} -embedded-develop: +embedded-develop: forceRelink ${DEVBUILD} ${EMBEDDEDOPTS} -embedded-deploy: +embedded-deploy: forceRelink ${DEPBUILD} ${EMBEDDEDOPTS} install-embedded-develop: @@ -72,3 +72,16 @@ clean-deploy: ${DEPBUILD} clean ################################################################################ + +forceRelink: + @-cd ${BUILD_DIR}; \ + rm -rf Tcl.framework tclsh8.4 \ + Development.build/Tcl.build/Tcl Deployment.build/Tcl.build/Tcl + +################################################################################ + +.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 forceRelink \ + +################################################################################ |