summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2008-08-19 00:08:36 (GMT)
committerdas <das>2008-08-19 00:08:36 (GMT)
commitc816c742535d4520f6ac3b49f6348b46cc6a4ca8 (patch)
tree60d6070bd37835e828aeb60f0c8abea1e8ab752f /macosx
parentaa922c8a17efc0fc4cdfbab12d0b98f4752f9e2d (diff)
downloadtk-c816c742535d4520f6ac3b49f6348b46cc6a4ca8.zip
tk-c816c742535d4520f6ac3b49f6348b46cc6a4ca8.tar.gz
tk-c816c742535d4520f6ac3b49f6348b46cc6a4ca8.tar.bz2
force-disable nonsensical embedded build for X11; only rewrite tkConfig.sh when really necessary
Diffstat (limited to 'macosx')
-rw-r--r--macosx/GNUmakefile5
1 files 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