From 637ae4c9159b785f8c0494077f49c1e8f54a0c96 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Mon, 16 Oct 2006 17:36:18 +0000
Subject: 	* macosx/GNUmakefile: don't redo prebinding of non-prebound
 binaires.

---
 ChangeLog          |  2 ++
 macosx/GNUmakefile | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce67feb..6a1f554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
 	* generic/tkCanvPoly.c (ConfigurePolygon):  linewidth in gc even for
 	* generic/tkRectOval.c (ConfigureRectOval): fills (as it controls AA).
 
+	* macosx/GNUmakefile: don't redo prebinding of non-prebound binaires.
+
 2006-10-10  Don Porter  <dgp@users.sourceforge.net>
 
 	* changes:	Updates for 8.5a5 release
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 2f88506..3e2e286 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -4,7 +4,7 @@
 #	uses the standard unix build system in tk/unix (which can be used directly instead of this
 #	if you are not using the tk/macosx projects).
 #
-# RCS: @(#) $Id: GNUmakefile,v 1.6 2006/09/10 17:06:32 das Exp $
+# RCS: @(#) $Id: GNUmakefile,v 1.7 2006/10/16 17:36:18 das Exp $
 #
 ########################################################################################################
 
@@ -215,8 +215,11 @@ ifeq (${EMBEDDED_BUILD},1)
 	@rm -f "${INSTALL_ROOT}${BINDIR}/${WISH}" && \
 	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 [ -n "${TK_X11}" -a ! -d usr/X11R6 ]; then mkdir -p usr && ln -fs /usr/X11R6 usr/ && RM_USRX11=1; fi; \
 	if [ ! -d System ]; then ln -fs /System . && RM_SYSTEM=1; fi; \
@@ -227,7 +230,7 @@ else
 	if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \
 	if [ -n "$${RM_USRX11:-}" ]; then rm -f usr/X11R6; rmdir -p usr 2>&-; fi; \
 	if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi; \
-	if [ -n "$${RM_TCL:-}" ]; then rm -f ./${LIBDIR}/Tcl.framework; fi
+	if [ -n "$${RM_TCL:-}" ]; then rm -f ./${LIBDIR}/Tcl.framework; fi; fi
 # install wish symbolic link
 	@ln -fs ${WISH} ${INSTALL_ROOT}${BINDIR}/${wish}
 endif
-- 
cgit v0.12