From c816c742535d4520f6ac3b49f6348b46cc6a4ca8 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Tue, 19 Aug 2008 00:08:36 +0000
Subject: force-disable nonsensical embedded build for X11; only rewrite
 tkConfig.sh when really necessary

---
 macosx/GNUmakefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 0a5aca7..4c5fb49 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: GNUmakefile,v 1.9.2.1 2008/05/06 16:33:43 das Exp $
+# RCS: @(#) $Id: GNUmakefile,v 1.9.2.2 2008/08/19 00:08:36 das Exp $
 #
 ########################################################################################################
 
@@ -131,6 +131,7 @@ else
 override CONFIGURE_ARGS := ${CONFIGURE_ARGS} --enable-xft
 VERSION			:= ${VERSION}-X11
 wish			:= ${wish}-X11
+override EMBEDDED_BUILD := 0
 endif
 
 INSTALL_TARGETS		= install-binaries install-libraries
@@ -184,7 +185,7 @@ ${objdir}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure \
 	--mandir="${MANDIR}" --enable-threads --enable-framework \
 	--with-tcl="${TCL_DIR}" \
 	${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}; else ./config.status; fi
-ifneq (${TK_X11},)
+ifneq (${VERSION},${TCL_VERSION})
 	@cd "${OBJ_DIR}" && sed -e 's#/Versions/${TCL_VERSION}#/Versions/${VERSION}#' \
 	tkConfig.sh > tkConfig.sh.1 && mv -f tkConfig.sh.1 tkConfig.sh
 endif
-- 
cgit v0.12