diff options
| author | das <das> | 2006-10-16 17:34:41 (GMT) |
|---|---|---|
| committer | das <das> | 2006-10-16 17:34:41 (GMT) |
| commit | a86ebca112b1c09a071960cdce9f6ba7d4bf7b23 (patch) | |
| tree | 84a87c0183769cf7dbcd8bbe49251e828d2bc463 | |
| parent | 5aad87b2a6c4c90a1c44234386a37c54605627f4 (diff) | |
| download | tcl-a86ebca112b1c09a071960cdce9f6ba7d4bf7b23.zip tcl-a86ebca112b1c09a071960cdce9f6ba7d4bf7b23.tar.gz tcl-a86ebca112b1c09a071960cdce9f6ba7d4bf7b23.tar.bz2 | |
* macosx/Makefile: don't redo prebinding of non-prebound binaires.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | macosx/Makefile | 11 |
2 files changed, 9 insertions, 4 deletions
@@ -4,6 +4,8 @@ * changes: updates for 8.4.14 release. + * macosx/Makefile: don't redo prebinding of non-prebound binaires. + 2006-10-11 Andreas Kupries <andreask@activestate.com> * generic/tclPkg.c (Tcl_PkgRequireEx): Corrected crash when diff --git a/macosx/Makefile b/macosx/Makefile index 0a1869a..8ec7027 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -4,7 +4,7 @@ # uses the standard unix build system in tcl/unix (which can be used directly instead of this # if you are not using the tk/macosx projects). # -# RCS: @(#) $Id: Makefile,v 1.5.2.15 2006/04/12 00:58:05 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.5.2.16 2006/10/16 17:34:42 das Exp $ # ######################################################################################################## @@ -154,14 +154,17 @@ ifeq (${EMBEDDED_BUILD},1) @rm -f "${INSTALL_ROOT}${BINDIR}/${TCLSH}" && \ rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&- || true else -# redo prebinding - @cd ${INSTALL_ROOT}/ && \ +# redo prebinding (when not building for Mac OS X 10.4 or later only) + @if [ "`echo "$${MACOSX_DEPLOYMENT_TARGET}" | \ + awk -F '10\\.' '{print int($$2)}'`" -lt 4 -a "`echo "$${CFLAGS}" | \ + awk -F '-mmacosx-version-min=10\\.' '{print int($$2)}'`" -lt 4 ]; \ + then cd ${INSTALL_ROOT}/; \ if [ ! -d usr/lib ]; then mkdir -p usr && ln -fs /usr/lib usr/ && RM_USRLIB=1; fi; \ if [ ! -d System ]; then ln -fs /System . && RM_SYSTEM=1; fi; \ redo_prebinding -r . "./${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}/${PRODUCT_NAME}"; \ redo_prebinding -r . "./${BINDIR}/${TCLSH}"; \ if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \ - if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi + if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi; fi # install tclsh symbolic link @ln -fs ${TCLSH} ${INSTALL_ROOT}${BINDIR}/tclsh endif |