diff options
| author | das <das> | 2002-08-30 19:17:35 (GMT) |
|---|---|---|
| committer | das <das> | 2002-08-30 19:17:35 (GMT) |
| commit | 7ad4bdd2a26d105b2efe096efa9afd6341b21c55 (patch) | |
| tree | e4714fe2ee6e362d493982accbd9255d162adfbc | |
| parent | f446739a314cd238a075baa1fca51be32dd0b56b (diff) | |
| download | tcl-7ad4bdd2a26d105b2efe096efa9afd6341b21c55.zip tcl-7ad4bdd2a26d105b2efe096efa9afd6341b21c55.tar.gz tcl-7ad4bdd2a26d105b2efe096efa9afd6341b21c55.tar.bz2 | |
set SYMROOT in macosx/Makefile
fix to 'find' syntax in project
| -rw-r--r-- | macosx/Makefile | 16 | ||||
| -rw-r--r-- | macosx/Tcl.pbproj/project.pbxproj | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index f3c1180..a482069 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,12 +3,14 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.1.2.1 2002/08/30 18:11:33 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.1.2.2 2002/08/30 19:17:35 das Exp $ # ################################################################################ INSTALL_ROOT = +BUILD_DIR = ../../build + TARGET = Tcl DEVBUILDSTYLE = Development @@ -16,8 +18,12 @@ DEPBUILDSTYLE = Deployment PBXBUILD = /usr/bin/pbxbuild -DEVBUILD = ${PBXBUILD} -target "${TARGET}" -buildstyle "${DEVBUILDSTYLE}" -DEPBUILD = ${PBXBUILD} -target "${TARGET}" -buildstyle "${DEPBUILDSTYLE}" +BUILD = ${PBXBUILD} SYMROOT="${BUILD_DIR}" -target "${TARGET}" + +DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" +DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" + +INSTALLOPTS = INSTALL_ROOT="${INSTALL_ROOT}" ################################################################################ @@ -36,10 +42,10 @@ deploy: ${DEPBUILD} install-develop: - ${DEVBUILD} install INSTALL_ROOT="${INSTALL_ROOT}" + ${DEVBUILD} install ${INSTALLOPTS} install-deploy: - ${DEPBUILD} install INSTALL_ROOT="${INSTALL_ROOT}" + ${DEPBUILD} install ${INSTALLOPTS} clean-develop: ${DEVBUILD} clean diff --git a/macosx/Tcl.pbproj/project.pbxproj b/macosx/Tcl.pbproj/project.pbxproj index 642dd8c..931bf73 100644 --- a/macosx/Tcl.pbproj/project.pbxproj +++ b/macosx/Tcl.pbproj/project.pbxproj @@ -90,7 +90,7 @@ refType = 4; }; 00E2F84B016E8A830ACA28DC = { - buildArgumentsString = "-c \"if [ \\\"${ACTION}\\\" != \\\"clean\\\" ]; then if [ -z \\\"`find Makefile -newer \\\"${SRCROOT}/../unix/configure\\\"`\\\" ]; then \\\"${SRCROOT}/../unix/configure\\\" --prefix=/usr --mandir=/usr/share/man --libdir=\\\"${LIBDIR}\\\" --includedir=\\\"${LIBDIR}/Headers\\\" --enable-threads --enable-framework ${EXTRA_CONFIGURE_FLAGS}; mkdir -p Tcl.framework; ln -fs ../Tcl Tcl.framework/Tcl; fi; else rm -f Makefile; fi\""; + buildArgumentsString = "-c \"if [ \\\"${ACTION}\\\" != \\\"clean\\\" ]; then if [ -z \\\"`find . -name Makefile -newer \\\"${SRCROOT}/../unix/configure\\\"`\\\" ]; then \\\"${SRCROOT}/../unix/configure\\\" --prefix=/usr --mandir=/usr/share/man --libdir=\\\"${LIBDIR}\\\" --includedir=\\\"${LIBDIR}/Headers\\\" --enable-threads --enable-framework ${EXTRA_CONFIGURE_FLAGS}; mkdir -p Tcl.framework; ln -fs ../Tcl Tcl.framework/Tcl; fi; else rm -f Makefile; fi\""; buildPhases = ( ); buildSettings = { |