diff options
| author | das <das> | 2008-08-19 00:08:34 (GMT) |
|---|---|---|
| committer | das <das> | 2008-08-19 00:08:34 (GMT) |
| commit | 5e49f06c06d017b4a62fce8682ed7d31bff95632 (patch) | |
| tree | 000e76e4579c72b099e16440efb52051ba9751df | |
| parent | dd56eaf2d1e9fe87d131b70cb539bc868f792cf7 (diff) | |
| download | tk-5e49f06c06d017b4a62fce8682ed7d31bff95632.zip tk-5e49f06c06d017b4a62fce8682ed7d31bff95632.tar.gz tk-5e49f06c06d017b4a62fce8682ed7d31bff95632.tar.bz2 | |
force-disable nonsensical embedded build for X11; only rewrite tkConfig.sh when really necessary
| -rw-r--r-- | macosx/GNUmakefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index 38a815d..ecd8d8c 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.10 2008/05/06 16:33:20 das Exp $ +# RCS: @(#) $Id: GNUmakefile,v 1.11 2008/08/19 00:08:34 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 |